changes

liuhaonan

2022-08-12 74ac7af1acc588fee71d3d982c633dd841ead6e3

changes

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

@@ -141,14 +141,7 @@
            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
                    + "灯杆id为{" + poleIds + "}");
        }
//        //记录这些灯杆原先的id
//        List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());

        //判断param.getPoleIdList()中是否有旧的灯杆ID    (直接下发)
//        List<Long> newPoleIdList = param.getPoleIdList().stream().filter(poleId -> !oldList.contains(poleId)).collect(Collectors.toList());
        //判断param.getPoleIdList()中是否有新的灯杆ID    (覆盖操作)
//        List<Long> oldPoleIdList = param.getPoleIdList().stream().filter(poleId -> oldList.contains(poleId)).collect(Collectors.toList());
        //新增不存在关灯操作


        List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
@@ -158,29 +151,7 @@

        }

//        List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
//        List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
//        if (!oldPoleIdList.isEmpty()) {
//            //覆盖操作灯杆
//            Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
//            oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
//            oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
//        }
//        //覆盖成功 添加新的任务关系
//        if (!oldPoleSuccess.isEmpty()) {
//            oldPoleSuccess.forEach(success -> {
//                success.setTaskId(newLightTask.getTaskId());
//            });
//        }

        //判断旧灯杆覆盖操作是否存在失败  如果存在失败，则保存旧的任务关系
//        List<LightTaskPoleRelation> failOldLightTaskStatusAndPoles = new ArrayList<>();
//        if (!oldPoleFail.isEmpty()) {
//            //获取失败的灯杆id
//            List<Long> failPoleIdList = oldPoleFail.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
//            //从oldLightTaskStatusAndPoles获取失败的灯杆原先的任务绑定关系.
//            failOldLightTaskStatusAndPoles = oldLightTaskStatusAndPoles.stream().filter(lightTaskPoleRelation -> failPoleIdList.contains(lightTaskPoleRelation.getPoleId())).collect(Collectors.toList());
//        }

        /**
         * 下发路灯任务日志记录开始
@@ -196,18 +167,6 @@
        all.addAll(newPoleMap);
        int num = (int) newPoleMap.stream().filter(lightTaskPoleRelation -> lightTaskPoleRelation.getIssueStatus() != 0).count();

//        all.addAll(oldPoleSuccess)
        //旧灯杆下发失败不需要保存信管系

//        //删除旧灯杆中覆盖成功的任务id
//        List<Long> oldSuccessPoleId = new ArrayList<>();
//        for (LightTaskPoleRelation bean : oldPoleSuccess) {
//            oldSuccessPoleId.add(bean.getPoleId());
//        }
////        if (!oldSuccessPoleId.isEmpty()) {
////            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId).eq(LightTaskPoleRelation::getLightAddress, "0001"));
////            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId).eq(LightTaskPoleRelation::getLightAddress, "0002"));
////        }

        //保存新灯杆以及旧灯杆覆盖成功的任务关系
        if (!all.isEmpty()) {
@@ -321,14 +280,6 @@
            newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
        }

//        List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
//        List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
//        if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
//            //覆盖操作灯杆
//            Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
//            oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
//            oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
//        }

        List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
        List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();