changes

liuhaonan

2022-08-12 c04eb4859667264dd55a77aed70c0f5479b3384a

changes

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

@@ -120,9 +120,11 @@
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldLightTaskStatusAndPoles;
        if ("FFFF".equals(param.getLightAddress())) {
            oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001").or(relation -> {
                relation.eq(LightTaskPoleRelation::getLightAddress, "0002");
            }));
            oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                    .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001"));
            List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                    .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0002"));
            oldLightTaskStatusAndPoles.addAll(list);
        } else {
            oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
        }
@@ -130,62 +132,55 @@
        /**
         * 重复任务的灯头
         */
        List<Long> taskIds = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
        List<Long> poleIds = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
        //poleIds中重复元素只保留一个
        taskIds = taskIds.stream().distinct().collect(Collectors.toList());
        poleIds = poleIds.stream().distinct().collect(Collectors.toList());
        if (!oldLightTaskStatusAndPoles.isEmpty()) {
            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList()) + "}, " + "灯杆id为{" + oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList()) + "}");
            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
                    + "灯杆id为{" + poleIds + "}");
        }
        //记录这些灯杆原先的id
        List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
//        //记录这些灯杆原先的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());
//        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<Long> oldPoleIdList = param.getPoleIdList().stream().filter(poleId -> oldList.contains(poleId)).collect(Collectors.toList());
        //新增不存在关灯操作

//        //判断旧灯杆是否有新灯头地址
//        List<Long> oldPoleIdListHasNewLightAddress = oldPoleIdList.stream().filter(poleId -> {
//            List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
//                    .eq(LightTaskPoleRelation::getPoleId, poleId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
//            if (CollectionUtil.isNotEmpty(lightTaskPoleRelations)) {
//                return !lightTaskPoleRelations.get(0).getLightAddress().equals(param.getLightAddress());
//            }
//            return false;
//        }).collect(Collectors.toList());

//        if (!oldPoleIdListHasNewLightAddress.isEmpty()) {
//            throw new BusinessException("任务中存在已有任务的单灯,灯杆id为{" + oldPoleIdListHasNewLightAddress + "}");
//        }

        List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
        if (!newPoleIdList.isEmpty()) {
        if (!poleIdList.isEmpty()) {
            //新灯杆下发新任务
            newPoleMap = sendControllerFrame(newLightTask, newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
            newPoleMap = sendControllerFrame(newLightTask, poleIdList, newLightTask.getFramePayload(), param.getLightAddress());

        }

        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> 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());
        }
//        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());
//        }

        /**
         * 下发路灯任务日志记录开始
@@ -199,32 +194,27 @@

        List<LightTaskPoleRelation> all = new ArrayList<>();
        all.addAll(newPoleMap);
        all.addAll(oldPoleSuccess);
        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::getTaskId, oldLightTaskStatusAndPoles.get(0).getTaskId()));

        }
//        //删除旧灯杆中覆盖成功的任务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()) {
//            all.forEach(
//                    bean->{
//                        lightTaskPoleRelationService.save(bean);
//                    }
//            );
            lightTaskPoleRelationService.saveBatch(all);
        }

        if (!param.getPoleIdList().isEmpty() && !all.isEmpty() && !oldPoleFail.isEmpty()) {
            return "任务中存在下发异常，异常灯杆原任务关系保留";
        } else if (!param.getPoleIdList().isEmpty() && all.isEmpty()) {
        if (!param.getPoleIdList().isEmpty() && num == newPoleMap.size()) {
            //所有灯杆都下发失败 新增的任务不保留
            removeById(newLightTask);
            throw new BusinessException("指令下发失败,请检查灯杆状态后重新新增任务");
@@ -254,10 +244,10 @@

        LightTask newLightTask = new LightTask();
        newLightTask.setTaskName(param.getTaskName());
        if (SecurityUtils.getClientId() != null) {
            lightTask.setClientId(clientService.getClientId());
            lightTask.setUserId(SecurityUtils.getUserId());
        }

        newLightTask.setClientId(clientService.getClientId());
        newLightTask.setUserId(SecurityUtils.getUserId());

        newLightTask.setWeek(week);
        newLightTask.setCreateUser(SecurityUtils.getUsername());
        newLightTask.setControlOrder(param.getControlOrder());
@@ -270,6 +260,9 @@

        //编辑后灯杆ID集合
        List<Long> poleIdList = param.getPoleIdList();
        if (poleIdList.isEmpty()) {
            throw new BusinessException("编辑任务时请选择灯杆");
        }
        //记录任务编辑器前灯杆ID集合
        List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
        List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskStatusAndPole::getId).collect(Collectors.toList());
@@ -284,35 +277,34 @@

        //取出覆盖操作的关系信息
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldRelation;
        List<LightTaskPoleRelation> oldRelation = new ArrayList<>();
        if ("FFFF".equals(param.getLightAddress())) {
            // 灯杆中存在其他任务的灯头
            oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001").or(relation -> {
                relation.eq(LightTaskPoleRelation::getLightAddress, "0002");
            }).ne(LightTaskPoleRelation::getTaskId, taskId));
            if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
                oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
                        .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, "0001"));
                List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
                        .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, "0002"));
                oldRelation.addAll(list);
            }
        } else {
            oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
            if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
                oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
                        .eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
            }
        }

        /**
         * 重复任务的灯头
         */
        if (!oldLightTaskStatusAndPoles.isEmpty()) {
            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + oldRelation.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList()) + "}, " + "灯杆id为{" + oldRelation.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList()) + "}");
        }


        //判断旧灯杆是否有新灯头地址
        List<Long> oldPoleIdListHasNewLightAddress = oldPoleIdList.stream().filter(poleId -> {
            List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, poleId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
            if (CollectionUtil.isNotEmpty(lightTaskPoleRelations)) {
                return !lightTaskPoleRelations.get(0).getLightAddress().equals(param.getLightAddress());
            }
            return false;
        }).collect(Collectors.toList());

        if (!oldPoleIdListHasNewLightAddress.isEmpty()) {
            throw new BusinessException("任务中存在已有任务的单灯,灯杆id为{" + oldPoleIdListHasNewLightAddress + "}");
        if (!oldRelation.isEmpty()) {
            List<Long> taskIds = oldRelation.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
            List<Long> poleIds = oldRelation.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
            //poleIds中重复元素只保留一个
            taskIds = taskIds.stream().distinct().collect(Collectors.toList());
            poleIds = poleIds.stream().distinct().collect(Collectors.toList());
            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
                    + "灯杆id为{" + poleIds + "}");
        }


@@ -329,14 +321,14 @@
            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> 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<>();
@@ -350,12 +342,12 @@
        }


        if (closePoleFail.size() == 0 && oldPoleFail.size() == 0) {
        if (closePoleFail.size() == 0) {
            //旧任务中全部发送指令成功，更新原本任务中的数据
            newLightTask.setTaskId(lightTask.getTaskId());
            updateById(newLightTask);
        } else {
            if (!newPoleSuccess.isEmpty() || !oldPoleSuccess.isEmpty()) {
            if (!newPoleSuccess.isEmpty()) {
                //有失敗的需要保存旧的任務，新增新的任务数据进行保存
                save(newLightTask);
            }
@@ -380,14 +372,6 @@
        for (LightTaskPoleRelation bean : newPoleSuccess) {
            bean.setTaskId(newLightTask.getTaskId());
        }
        //成功用新的任务ID
        for (LightTaskPoleRelation bean : oldPoleSuccess) {
            bean.setTaskId(newLightTask.getTaskId());
        }
        //失败用旧的任务ID
        for (LightTaskPoleRelation bean : oldPoleFail) {
            bean.setTaskId(lightTask.getTaskId());
        }

        //失败用旧的任务ID
        for (LightTaskPoleRelation bean : closePoleFail) {
@@ -396,19 +380,11 @@

        List<LightTaskPoleRelation> all = new ArrayList<>();
        all.addAll(newPoleSuccess);
        all.addAll(oldPoleSuccess);
        all.addAll(oldPoleFail);
        all.addAll(closePoleFail);
//        all.addAll(closePoleFail);


        List<Long> allPoleId = new ArrayList<>();
        for (LightTaskPoleRelation bean : newPoleSuccess) {
            allPoleId.add(bean.getPoleId());
        }
        for (LightTaskPoleRelation bean : oldPoleSuccess) {
            allPoleId.add(bean.getPoleId());
        }
        for (LightTaskPoleRelation bean : oldPoleFail) {
            allPoleId.add(bean.getPoleId());
        }
        for (LightTaskPoleRelation bean : closePoleSuccess) {
@@ -419,6 +395,7 @@
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));

        }

        if (!all.isEmpty()) {
            lightTaskPoleRelationService.saveBatch(all);
        }
@@ -433,13 +410,13 @@
         * 下发路灯任务日志记录结束
         */

        if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
        if (newPoleFail.isEmpty() && closePoleFail.isEmpty()) {
            return "编辑成功";
        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
            throw new BusinessException("编辑失败,请检查编辑的设备是否在线!");
        } else if (!closePoleFail.isEmpty() /*|| !oldPoleFail.isEmpty()*/) {
        } else if (newPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
            throw new BusinessException("编辑失败,请检查原有设备和编辑后的设备是否在线!");
        } else if (!closePoleFail.isEmpty() && !newPoleSuccess.isEmpty()) {
            return "原任务中存在下发异常，原任务保留，创建新任务进行保存";
        } else if (!newPoleFail.isEmpty()) {
        } else if (!newPoleFail.isEmpty() && !newPoleSuccess.isEmpty()) {
            return "新任务中存在下发异常，忽略异常操作的灯杆";
        } else {
            return "操作异常";