优化

liuhaonan

2022-07-22 d9a9d8a2dad1d1e57b184bf8f972a03d654d883a

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

@@ -14,13 +14,15 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.request.Schedules;
import com.sandu.ximon.admin.utils.request.TaskSchedules;
import com.sandu.ximon.admin.utils.request.requestbody.GetSchedules;
import com.sandu.ximon.admin.utils.request.requestbody.Task;
import com.sandu.ximon.admin.utils.request.TaskSchedules;
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;
@@ -92,6 +94,15 @@
                ledScheduleEntity.setClientId(clientService.getClientId());
            }
        }

        /**
         * 熙汛定时更改 日志记录开始
         */
        String content = "{熙汛定时id：" + ledScheduleEntity.getId() + ",熙汛定时名称：" + ledScheduleEntity.getName() + "熙汛定时内容：" + JSON.toJSONString(ledScheduleEntity.getSchedule()) + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛定时任务更改", content);
        /**
         * 熙汛定时更改 日志记录结束
         */
        return this.save(ledScheduleEntity);
    }

@@ -120,6 +131,23 @@
                lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), ledScheduleEntity.getSchedule());
            }
        }

        /**
         * 熙汛定时推送 日志记录开始
         */
        String message = "";
        List<String> listCode = new ArrayList<>();

        for (PoleLightemitEntity entity : poleLightemitEntities) {

            listCode.add(entity.getLightemitControlCode());
            message += "[屏幕Code:" + entity.getLightemitControlCode() + "屏幕名称:" + entity.getLightemitName() + "],";
        }
        String content = "{熙汛定时id：" + ledScheduleEntity.getId() + ",熙汛定时名称：" + ledScheduleEntity.getName() + "熙汛屏幕信息：" + message + " }";
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "推送熙汛定时任务", content);
        /**
         * 熙汛定时任务推送 日志记录结束
         */
    }

    public boolean updateSchedule(LEDScheduleParam_xixun paramXixun) {
@@ -157,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) {
@@ -170,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);
    }

@@ -183,14 +238,14 @@
        PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);

        String result1 = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
        if(result1.indexOf("not open")!=-1){
        if (result1.indexOf("not open") != -1) {
            LedScheduleVO notOpen = new LedScheduleVO();
            notOpen.setLedName(poleLightemitEntity.getLightemitName());
            notOpen.setScheduleName("设备未开启");
            return notOpen;
        }
        boolean flag = result1.contains("exist");
        if(flag!=true) {
        if (flag != true) {
            String result = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
//            if(result !=null){
            GetSchedules getSchedules = new GetSchedules();
@@ -218,7 +273,7 @@
                ledScheduleVO.setScheduleName("无定时");
            }
            return ledScheduleVO;
        }else {
        } else {
            LedScheduleVO ledScheduleVO = new LedScheduleVO();
            ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
            ledScheduleVO.setScheduleName("设备未开启");