2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-27 3885a00f7b152256f865ad8ccc4566dd43681085
排序
已修改14个文件
309 ■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
@@ -17,14 +17,50 @@
    /**
     * 诺瓦-节目列表
     */
    //创建时间
    LED_N_PROGRAM_CREATE_TIME("create_date"),
    /**
     * 诺瓦-播放计划列表
     */
    //创建时间
    LED_N_PLAY_PLAN_CREATE_TIME("create_date"),
    /**
     * 熙迅-列表
     */
    //板卡编号、名称、绑定灯杆名称、创建时间)
    LED_S_CODE("t1.lightemit_control_code"),
    //名称
    LED_S_NAME("t1.lightemit_name"),
    //绑定灯杆名称
    LED_S_POLE_NAME("t3.pole_name"),
    //创建时间
    LED_S_CREATE_TIME("t1.create_date"),
    /**
     * 熙迅-节目列表
     */
    LED_S_PROGRAM_CREATE_TIME("create_date"),
    /**
     * 熙迅-播放计划
     */
    //创建时间
    LED_S_PLAY_PLAN_CREATE_TIME("create_date"),
    /**
     * 摄像头列表
     */
    //灯杆名称
    MONITOR_POLE_NAME("t3.pole_name"),
    //添加时间
    MONITOR_CREATE_TIME("t1.update_time"),
    /**
@@ -61,8 +97,6 @@
    POLE_NAME("pole_name"),
    POLE_ID("id"),
    POLE_CREATE_TIME("create_time"),
    /**
dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java
@@ -15,9 +15,9 @@
public interface PoleLightemitEntityMapper extends BaseMapper<PoleLightemitEntity> {
    void updateRequestBody(@Param("ledCode")String ledCode, @Param("postBody")String postBody);
    void updateRequestBody(@Param("ledCode") String ledCode, @Param("postBody") String postBody);
    List<PoleLightemitEntity> listLed(String keyword, Long userid);
    List<PoleLightemitEntity> listLed(String keyword, Long userid, String orderBy);
    Pole getpole(String lightemitControlCode);
}
dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
@@ -54,6 +54,9 @@
                AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
            </if>
        </where>
        <if test="orderBy != null">
            ORDER BY ${orderBy}
        </if>
    </select>
    <select id="getpole" resultType="com.sandu.ximon.dao.domain.Pole" parameterType="java.lang.String">
        SELECT
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
@@ -161,7 +161,7 @@
    @GetMapping("/getNledProgeamList")
    public ResponseVO<Object> getNledProgeamList() {
        List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null);
        List<LEDProgram> ledPrograms = ledProgramService.listProgram(null, null,null,null);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (LEDProgram bean : ledPrograms) {
@@ -183,7 +183,7 @@
    @GetMapping("/getSledList")
    public ResponseVO<Object> getSledList() {
        List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, false);
        List<PoleLightemitEntity> poleLightemitEntities = sLedService.listLed(null, null, null, false);
        List<Map> mapList = new ArrayList<>();
        Map map;
        for (PoleLightemitEntity bean : poleLightemitEntities) {
@@ -211,9 +211,9 @@
        List<MonitorBo> monitorBos;
        //超管
        if (SecurityUtils.getClientId() == null) {
            monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2,null);
            monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
        } else {
            monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2,null);
            monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
        }
        List<Map> mapList = new ArrayList<>();
        Map map;
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -56,11 +56,14 @@
    @GetMapping("/list")
    public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO,
                                          @RequestParam(value = "order", required = false) Integer order,
                                          @RequestParam(value = "seq", required = false) Integer seq,
                                          @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.successPage(ledProgramService.listProgram(baseConditionVO, keyword));
        return ResponseUtil.successPage(ledProgramService.listProgram(baseConditionVO, order, seq, keyword));
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -6,7 +6,6 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.PermissionConfig;
@@ -15,6 +14,7 @@
import com.sandu.ximon.admin.vo.NovaPushResultVO;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.enums.MenuEnum;
import com.sandu.ximon.dao.enums.OrderByEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -83,11 +83,41 @@
    }
    @GetMapping("/listPlan")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
                                   @RequestParam(value = "order", required = false) Integer order,
                                   @RequestParam(value = "seq", required = false) Integer seq,
                                   @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.LED_N_PLAY_PLAN_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
        if (SecurityUtils.getClientId() != null) {
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
@@ -122,14 +121,15 @@
     * @return
     */
    @GetMapping("/list")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
                                   @RequestParam(value = "order", required = false) Integer order,
                                   @RequestParam(value = "seq", required = false) Integer seq,
                                   @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = xiXunPlayerService.XixunPlayerList(keyword);
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(xiXunPlayerService.list(wrapper));
        List<PoleXixunPlayerEntity> list = xiXunPlayerService.listProgram(baseConditionVO, order, seq, keyword);
        return ResponseUtil.success(list);
    }
@@ -230,12 +230,15 @@
     * @return
     */
    @GetMapping("/listLed")
    public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
    public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO,
                                      @RequestParam(value = "order", required = false) Integer order,
                                      @RequestParam(value = "seq", required = false) Integer seq,
                                      @RequestParam(value = "keyword", required = false) String keyword,
                                      @RequestParam(value = "isOnLine", required = false) boolean isOnLine) {
        if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
        List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, order, seq, isOnLine);
        poleLightemitEntityList.forEach(led -> {
            led.setStreetlightId(led.getPoleId());
            led.setStreetlightName(led.getPoleName());
@@ -430,12 +433,15 @@
    @GetMapping("/listSchedule")
    public ResponseVO<Object> listSchedule(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> listSchedule(BaseConditionVO baseConditionVO,
                                           @RequestParam(value = "order", required = false) Integer order,
                                           @RequestParam(value = "seq", required = false) Integer seq,
                                           @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(scheduleService.listSchedule(baseConditionVO, keyword));
        return ResponseUtil.success(scheduleService.listSchedule(baseConditionVO, order, seq, keyword));
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -20,7 +20,6 @@
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -41,15 +40,10 @@
    public boolean addFile(IpVolumeFileParam fileParam) {
        IpVolumeFile file = new IpVolumeFile();
//        if(SecurityUtils.getClientId()!=null){
//            file.setUserName(SecurityUtils.getUsername());
//        }
//
        if (SecurityUtils.getClientId() != null) {
            file.setUserName(SecurityUtils.getUsername());
            file.setUserId(SecurityUtils.getClientId());
            file.setClientId(clientService.getClientId());
        }
        file.setUserName(SecurityUtils.getUsername());
        file.setUserId(SecurityUtils.getClientId());
        file.setClientId(clientService.getClientId());
        file.setFileName(fileParam.getFileName());
        file.setFileUrl(fileParam.getFileUrl());
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -10,6 +10,7 @@
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;
@@ -80,14 +81,42 @@
        return param;
    }
    public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO, String keyword) {
    public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO,Integer order,Integer seq, String keyword) {
        LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        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 = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        }
        return list(wrapper);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -17,10 +17,8 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
/**
@@ -50,12 +48,10 @@
        LedSFile sFile = new LedSFile();
        BeanUtils.copyProperties(fileUploadDto, sFile);
        sFile.setCilentId(SecurityUtils.getClientId());
        if (SecurityUtils.getClientId() != null) {
            sFile.setUserId(SecurityUtils.getUserId());
            sFile.setUserName(SecurityUtils.getUsername());
            if (clientService.findClientId()) {
                sFile.setCilentId(clientService.getClientId());
            }
        sFile.setUserId(SecurityUtils.getUserId());
        sFile.setUserName(SecurityUtils.getUsername());
        if (clientService.findClientId()) {
            sFile.setCilentId(clientService.getClientId());
        }
        /**
         * 熙汛文件上传 日志记录开始
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -22,6 +22,7 @@
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.LedScheduleEntity;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LedScheduleEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -184,7 +185,7 @@
     * @param keyword
     * @return
     */
    public List listSchedule(BaseConditionVO baseConditionVO, String keyword) {
    public List listSchedule(BaseConditionVO baseConditionVO,Integer order,Integer seq, String keyword) {
        LambdaQueryWrapper<LedScheduleEntity> eq = Wrappers.lambdaQuery(LedScheduleEntity.class);
        //用户类型判断
        if (SecurityUtils.getClientId() != null) {
@@ -197,7 +198,34 @@
            eq = eq.like(LedScheduleEntity::getName, keyword);
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.LED_S_PLAY_PLAN_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),orderBy);
        return list(eq);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -16,6 +16,7 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,13 +65,49 @@
     * @param isOnLine
     * @return
     */
    public List<PoleLightemitEntity> listLed(String keyword, boolean isOnLine) {
    public List<PoleLightemitEntity> listLed(String keyword,Integer order,Integer seq, boolean isOnLine) {
        List<PoleLightemitEntity> poleLightemitEntityList;
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.LED_S_CODE.getCode();
                    break;
                case 2:
                    orderByResult = OrderByEnums.LED_S_NAME.getCode();
                    break;
                case 3:
                    orderByResult = OrderByEnums.LED_S_POLE_NAME.getCode();
                    break;
                case 4:
                    orderByResult = OrderByEnums.LED_S_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
        //超管
        if (SecurityUtils.getClientId() == null) {
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null);
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null,orderBy);
        } else {
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId());
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(),orderBy);
        }
        List<PoleLightemitEntity> temp = new ArrayList<>();
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -203,9 +203,9 @@
        MonitorParam monitorParam = new MonitorParam();
        monitorParam.setEquipmentState(2);
        monitorParam.setBindingState(2);
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
        monitorParam.setEquipmentState(1);
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
        result.put("monitorOnlineCount", online.size());
        result.put("monitorTotalCount", monitorBos.size());
@@ -277,8 +277,8 @@
        result.put("LightPoleHeelingTotalCount", lightPoleHeelings.size());
        //熙讯
        List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, false);
        List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, true);
        List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, false);
        List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, true);
        result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
        result.put("XiXunTotalCount", poleLightemitEntities.size());
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.config.RealtimeServerBean;
import com.sandu.ximon.admin.entity.*;
@@ -20,6 +22,7 @@
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
import lombok.AllArgsConstructor;
import org.apache.commons.lang.StringUtils;
@@ -63,6 +66,38 @@
                        }).like(PoleXixunPlayerEntity::getProgramName, keyword);
            }
        }
    }
    public List<PoleXixunPlayerEntity> listProgram(BaseConditionVO baseConditionVO, Integer order, Integer seq, String keyword) {
        LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = XixunPlayerList(keyword);
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.LED_S_PROGRAM_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        return list(wrapper);
    }
    public boolean insert(ProgramPro programPro) {
@@ -167,7 +202,7 @@
        try {
            Gson gson = new GsonBuilder().disableHtmlEscaping().create();
//            programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
            programPro=gson.fromJson(json,ProgramPro.class);
            programPro = gson.fromJson(json, ProgramPro.class);
            programPro.setProgramId(pid);
            programPro.setScreenShot(byId.getScreenShot());
            programPro.getLayers().forEach(