changes

liuhaonan

2022-07-06 c61daa1070487b6adeff3438633c10f750ac45ab

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java

@@ -3,11 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LEDProgram;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,12 +26,10 @@
    public boolean addProgram(LEDProgramParam receiveParam) {

        LEDProgram led = new LEDProgram();
        if (SecurityUtils.getClientId() != null) {
            led.setUserId(SecurityUtils.getUserId());
            led.setUserName(SecurityUtils.getUsername());
            if (clientService.findClientId()) {
                led.setClientId(clientService.getClientId());
            }
        led.setUserId(SecurityUtils.getUserId());
        led.setUserName(SecurityUtils.getUsername());
        if (clientService.findClientId()) {
            led.setClientId(clientService.getClientId());
        }
        led.setName(receiveParam.getName());
        led.setPreview(receiveParam.getPreviewUrl());
@@ -41,14 +42,11 @@

    public boolean updateProgram(Long pid, LEDProgramParam receiveParam) {

        LEDProgram byId = getById(pid);
        if (byId == null) {
        LEDProgram led = getById(pid);
        if (led == null) {
            throw new BusinessException("未找到该节目");
        }

        LEDProgram led = new LEDProgram();
        led.setId(pid);
        //led.setUserId(SecurityUtils.getClientId());
        led.setName(receiveParam.getName());
        led.setPreview(receiveParam.getPreviewUrl());
        led.setWidth(receiveParam.getWidth());
@@ -83,8 +81,57 @@
        return param;
    }

    public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO, Integer order, Integer seq, String keyword) {
        LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();

    public LambdaQueryWrapper<LEDProgram> listProgram() {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(LEDProgram::getName, keyword);
        }
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.LED_N_PROGRAM_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = OrderByEnums.ASC.getCode();
                    break;
                case 2:
                    orderBySeq = OrderByEnums.DESC.getCode();
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        }
        return list(wrapper);
    }

    public List<LEDProgram> listProgramOnBinding(String keyword) {
        LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();

        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(LEDProgram::getName, keyword);
        }

        return list(wrapper);
    }


    public LambdaQueryWrapper<LEDProgram> listPrograms() {
        if (SecurityUtils.getClientId() == null) {
            return Wrappers.lambdaQuery(LEDProgram.class);
        } else {