日志

liuhaonan

2022-05-16 3b8877b6d8c13e37f8c7769282a2751b0faeb499

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

@@ -14,10 +14,11 @@
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;
@@ -92,6 +93,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 +130,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) {
@@ -183,14 +210,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 +245,7 @@
                ledScheduleVO.setScheduleName("无定时");
            }
            return ledScheduleVO;
        }else {
        } else {
            LedScheduleVO ledScheduleVO = new LedScheduleVO();
            ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
            ledScheduleVO.setScheduleName("设备未开启");