changes

liuhaonan

2022-10-28 d938c951a1669b4df877ffc6521aef17f0fac809

changes

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

@@ -284,10 +284,12 @@
            //新灯杆下发新任务
            Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());

            //newPoleAll集合后面用于存储关系表
            newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
            newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
            newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
            if (newPoleMap != null) {
                //newPoleAll集合后面用于存储关系表
                newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
                newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
                newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
            }
        }

        List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
@@ -295,8 +297,10 @@
        if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
            //覆盖操作灯杆
            Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
            oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
            oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
            if (oldPoleMap != null) {
                oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
                oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
            }
        }


@@ -308,8 +312,10 @@
            String framePayloadClose = "";
            //关灯操作灯杆
            Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
            closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
            closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
            if (closePoleMap != null) {
                closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
                closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
            }
        }


@@ -664,6 +670,10 @@
            //存在任务关系   下发清除任务指令
            Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());

            if (ffff == null) {
                throw new BusinessException("删除失败");
            }

            /**
             * 删除控灯任务日志记录开始
             */

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

@@ -136,6 +136,8 @@
        }
        // 删除灯杆绑定关系
        poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
        SpringContextHolder.getBean(LightTaskPoleRelationService.class)
                .remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, poleId));

        /**
         * 删除灯杆日志记录开始
@@ -863,8 +865,8 @@
     *
     * @return 是否成功
     */
    public boolean unBindPole(Long poleId, String deviceCode,Integer deviceType) {
        return poleBindingService.unBindPole(poleId, deviceCode,deviceType);
    public boolean unBindPole(Long poleId, String deviceCode, Integer deviceType) {
        return poleBindingService.unBindPole(poleId, deviceCode, deviceType);
    }