日志

liuhaonan

2022-05-16 8b4c0b2fbbad5dfedeaf1c295088d6df243d2cd0

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

@@ -105,7 +105,7 @@
                + "， 灯杆ID：" + param.getPoleIdList().toString()
                + "， 控制的灯头地址：" + param.getLightAddress()
                + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "新增路灯任务", content, poleCodeList.toString());
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "新增路灯任务", content);
        /**
         * 新增路灯任务日志记录结束
         */
@@ -129,9 +129,9 @@

            String content1 = "{任务ID：" + lightTask.getTaskId()
                    + "， 任务名：" + lightTask.getTaskName()
                    + "},"+" 灯杆ID：" + param.getPoleIdList().toString()
                    + "}," + " 灯杆ID：" + param.getPoleIdList().toString()
                    + " }";
            StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "下发路灯任务", content1, poleCodeList.toString());
            StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "下发路灯任务", content1);
            /**
             * 下发路灯任务日志记录结束
             */
@@ -181,7 +181,7 @@
                + "， 灯杆ID：" + param.getPoleIdList().toString()
                + "， 控制的灯头地址：" + param.getLightAddress()
                + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "编辑路灯任务", content, poleCodeList.toString());
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "编辑路灯任务", content);
        /**
         * 编辑路灯任务日志记录结束
         */
@@ -206,9 +206,9 @@

            String content1 = "{任务ID：" + lightTask.getTaskId()
                    + "， 任务名：" + lightTask.getTaskName()
                    + "},"+" 灯杆ID：" + param.getPoleIdList().toString()
                    + "}," + " 灯杆ID：" + param.getPoleIdList().toString()
                    + " }";
            StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "下发路灯任务", content1, poleCodeList.toString());
            StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "下发路灯任务", content1);
            /**
             * 下发路灯任务日志记录结束
             */
@@ -334,6 +334,14 @@
                }
        );

        /**
         * 删除控灯任务日志记录开始
         */
        String content = "{控灯任务id：" + taskIdList + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "删除控灯任务", content);
        /**
         * 删除控灯任务日志记录结束
         */
        return true;
    }

@@ -407,16 +415,30 @@
        }
        String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
        List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());

        /**
         * 下发路灯任务日志记录开始
         */
        List<String> poleCodeList = new ArrayList<>();
        List<Pole> list = SpringContextHolder.getBean(PoleService.class).list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, param.getPoleId()));
        if (CollectionUtil.isNotEmpty(list)) {
            poleCodeList = list.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
        }
        String content = "{任务ID：" + lightTask.getTaskId()
                + "， 任务名：" + lightTask.getTaskName()
                + "}," + " 灯杆ID：" + param.getPoleId()
                + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "下发路灯任务", content);
        /**
         * 下发路灯任务日志记录结束
         */


        if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
            return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0),
                    Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId())
                            .eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
        }

        /**
         * 下发单灯任务-日志
         */
        String content = "下发单灯任务";


        return true;