fix

zhanzhiqin

2022-09-22 2bbf08be2b03a6260720fe0c1612afbd9e1cd45c

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

@@ -6,6 +6,7 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.druid.support.json.JSONUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -74,9 +75,13 @@
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String newAddLightTask(LightTaskParam param) {
    public String AddLightTask(LightTaskParam param) {
        if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
            throw new BusinessException("灯控命令格式不正确");
        }

        if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
            throw new BusinessException("灯头地址格式不正确");
        }
//        LightTask lightTask = getById(null);

@@ -105,42 +110,28 @@
            throw new BusinessException("保存路灯任务失败");
        }
        List<String> poleCodeList = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
            List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
        //传入的灯杆id集合
        List<Long> poleIdList = new ArrayList<>();
        //去重
        for (Long item : param.getPoleIdList()) {
            if (!poleIdList.contains(item)) {
                poleIdList.add(item);
            }
        }

        if (CollectionUtil.isNotEmpty(poleIdList)) {
            List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(poleIdList);
            if (CollectionUtil.isNotEmpty(poleList)) {
                poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
            }
        }
        String content = "{任务ID：" + newLightTask.getTaskId() + "， 任务名：" + newLightTask.getTaskName() + "}，{内帧指令" + newLightTask.getFramePayload() + "， 灯杆ID：" + param.getPoleIdList().toString() + "， 控制的灯头地址：" + param.getLightAddress() + " }";
        String content = "{任务ID：" + newLightTask.getTaskId() + "， 任务名：" + newLightTask.getTaskName() + "}，{内帧指令" + newLightTask.getFramePayload() + "， 灯杆ID：" + poleIdList.toString() + "， 控制的灯头地址：" + param.getLightAddress() + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "新增路灯任务", content);


        //传入的灯杆id集合
        List<Long> poleIdList = param.getPoleIdList();
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldLightTaskStatusAndPoles;
        if ("FFFF".equals(param.getLightAddress())) {
            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()));
        }

        /**
         * 重复任务的灯头
         */
        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为{" + taskIds + "}, "
                    + "灯杆id为{" + poleIds + "}");
        }
        List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));


        List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
@@ -150,46 +141,80 @@

        }

        newPoleMap.forEach(
                commend -> {
                    //开关灯时间
//                    String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
//                    if (newLightTask.getControlOrder() != null) {
//                        //控灯时间
//                        s = s + newLightTask.getControlOrder();
//                    }
//                    // 更新系统定时
//                    commend.setSysScheduled(s);
                    if (commend.getIssueStatus() == 0) {
                        //下发成功  更新系统定时和硬件定时
                        commend.setDeviceScheduled(JSONUtils.toJSONString(newLightTask));
                    } else {
                        //下发失败  更新系统定时  保留硬件定时 硬件定时
//                        commend.setSysScheduled(s);
                        oldLightTaskStatusAndPoles.forEach(task -> {
                            if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
                                //同一个灯头
                                LightTask oldTask = getById(task.getTaskId());
                                commend.setDeviceScheduled(JSONUtils.toJSONString(oldTask));
                            }
                        });

                    }
                }
        );


        /**
         * 下发路灯任务日志记录开始
         */

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

        List<LightTaskPoleRelation> all = new ArrayList<>();
        all.addAll(newPoleMap);
        int num = (int) newPoleMap.stream().filter(lightTaskPoleRelation -> lightTaskPoleRelation.getIssueStatus() != 0).count();

        //删除旧的关系
        lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()).in(LightTaskPoleRelation::getPoleId, poleIdList));

        //保存新灯杆以及旧灯杆覆盖成功的任务关系
        if (!all.isEmpty()) {
            lightTaskPoleRelationService.saveBatch(all);
        boolean b = true;
        //保存任务关系
        if (!newPoleMap.isEmpty()) {
            b = lightTaskPoleRelationService.saveBatch(newPoleMap);
        }

        if (!param.getPoleIdList().isEmpty() && num == newPoleMap.size()) {
        if (!b) {
            //所有灯杆都下发失败 新增的任务不保留
            removeById(newLightTask);
            throw new BusinessException("指令下发失败,请检查灯杆状态后重新新增任务");
        } else {
            return "任务新增成功";
        }


    }


    /**
     * 编辑路灯任务
     *
     * @param taskId
     * @param param
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String updateLightTask(Long taskId, LightTaskParam param) {
    public String newUpdateLightTask(Long taskId, LightTaskParam param) {
        if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
            throw new BusinessException("灯控命令格式不正确");
        }
        LightTask lightTask = getById(taskId);
        if (lightTask == null) {
        LightTask newLightTask = getById(taskId);
        if (newLightTask == null) {
            throw new BusinessException("找不到路灯任务");
        }

@@ -199,7 +224,7 @@
            week |= w;
        }

        LightTask newLightTask = new LightTask();
//        LightTask newLightTask = new LightTask();
        newLightTask.setTaskName(param.getTaskName());

        newLightTask.setClientId(clientService.getClientId());
@@ -214,66 +239,55 @@
        newLightTask.setUpdateTime(LocalDateTime.now());
        newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));

        updateById(newLightTask);

        //编辑后灯杆ID集合
        List<Long> poleIdList = param.getPoleIdList();
        if (poleIdList.isEmpty()) {
            throw new BusinessException("编辑任务时请选择灯杆");
        List<Long> poleIdList = new ArrayList<>();
        //去重
        for (Long item : param.getPoleIdList()) {
            if (!poleIdList.contains(item)) {
                poleIdList.add(item);
            }
        }
        //记录任务编辑器前灯杆ID集合
        List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
        List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskStatusAndPole::getId).collect(Collectors.toList());
//        List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
        List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
        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());
        //oldList中有的灯杆ID，但是param.getPoleIdList()中没有 (关灯操作)
        List<Long> closeLight = oldList.stream().filter(poleId -> !param.getPoleIdList().contains(poleId)).collect(Collectors.toList());
        //判断poleIdList中是否有旧的灯杆ID    (直接下发)
        List<Long> newPoleIdList = poleIdList.stream().filter(poleId -> !oldList.contains(poleId)).collect(Collectors.toList());
        //判断poleIdList中是否有新的灯杆ID    (覆盖操作)
        List<Long> oldPoleIdList = poleIdList.stream().filter(poleId -> oldList.contains(poleId)).collect(Collectors.toList());


        //oldList中有的灯杆ID，但是poleIdList中没有 (关灯操作)
        List<Long> closeLight = oldList.stream().filter(poleId -> !poleIdList.contains(poleId)).collect(Collectors.toList());


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

        if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
            List<Long> oldRelationList = new ArrayList<>();
            oldRelationList.addAll(oldPoleIdList);
            oldRelationList.addAll(closeLight);
            oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldRelationList)
                    .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
        }

        /**
         * 重复任务的灯头
         */
        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 + "}");
        }
        //取出任务中原有的任务信息
        List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .eq(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));




        relations.addAll(oldRelation);

        List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
        List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
        List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(newPoleIdList)) {
            //新灯杆下发新任务
            Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
            Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());

            //newPoleAll集合后面用于存储关系表
            newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
@@ -285,7 +299,7 @@
        List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
            //覆盖操作灯杆
            Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
            Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
            oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
            oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
        }
@@ -294,9 +308,9 @@
        List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
        List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
        System.out.println(closeLight + "closeLight");
        if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null&& closeLight.get(0) != null) {
            //关灯内帧
            String framePayloadClose = "7f0000007f173b00";
        if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null && closeLight.get(0) != null) {
            //清除帧指令
            String framePayloadClose = "";
            //关灯操作灯杆
            Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
            closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
@@ -304,96 +318,87 @@
        }


        if (closePoleFail.size() == 0) {
            //旧任务中全部发送指令成功，更新原本任务中的数据
            newLightTask.setTaskId(lightTask.getTaskId());
            updateById(newLightTask);
        } else {
            if (!newPoleSuccess.isEmpty()) {
                //有失敗的需要保存旧的任務，新增新的任务数据进行保存
                save(newLightTask);
            }
        }

        /**
         * 编辑路灯任务日志记录开始
         */
        List<String> poleCodeList = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
            List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
        if (CollectionUtil.isNotEmpty(poleIdList)) {
            List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(poleIdList);
            if (CollectionUtil.isNotEmpty(poleList)) {
                poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
            }
        }
        String content = "{任务ID：" + newLightTask.getTaskId() + "， 任务名：" + newLightTask.getTaskName() + "}，{内帧指令" + newLightTask.getFramePayload() + "， 灯杆ID：" + param.getPoleIdList().toString() + "， 控制的灯头地址：" + param.getLightAddress() + " }";
        String content = "{任务ID：" + newLightTask.getTaskId() + "， 任务名：" + newLightTask.getTaskName() + "}，{内帧指令" + newLightTask.getFramePayload() + "， 灯杆ID：" + poleIdList.toString() + "， 控制的灯头地址：" + param.getLightAddress() + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "编辑路灯任务", content);
        /**
         * 编辑路灯任务日志记录结束
         */

        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) {
            bean.setTaskId(lightTask.getTaskId());
        }

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

        if (!all.isEmpty()) {
            List<LightTaskPoleRelation> finalOldRelation = relations;
            all.forEach(
                    commend -> {
                        commend.setTaskId(newLightTask.getTaskId());
                        //开关灯时间
                        String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
                        if (newLightTask.getControlOrder() != null) {
                            //控灯时间
                            s = s + newLightTask.getControlOrder();
                        }
                        // 更新系统定时
                        commend.setSysScheduled(s);
                        // 先设置硬件定时为上次的硬件定时   不论成功失败
                        String finalS = s;
                        finalOldRelation.forEach(task -> {
                            if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
                                //同一个灯头
                                commend.setDeviceScheduled(task.getDeviceScheduled());
                                if (commend.getIssueStatus() == 0) {
                                    //下发成功  更新系统定时和硬件定时
                                    commend.setDeviceScheduled(finalS);
                                }
                            }
                        });

        List<Long> allPoleId = new ArrayList<>();
        for (LightTaskPoleRelation bean : newPoleSuccess) {
            allPoleId.add(bean.getPoleId());
                    }
            );
        }
        for (LightTaskPoleRelation bean : closePoleSuccess) {
            allPoleId.add(bean.getPoleId());
        }
        for (LightTaskPoleRelation bean : oldPoleSuccess) {
            allPoleId.add(bean.getPoleId());
        }
        boolean b = true;

        if (!allPoleId.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
        //编辑前后所有的灯杆ID集合
        poleIdList.addAll(oldList);
        if (!poleIdList.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));

        }

        if (!all.isEmpty()) {
            lightTaskPoleRelationService.saveBatch(all);
            b = lightTaskPoleRelationService.saveBatch(all);
        }


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

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

@@ -407,10 +412,11 @@
     */
    public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode, String lightAddress) {
        IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload, lightAddress)).orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build();
        System.out.println(requestFrame + "          --------requestFrame");

        WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);

        System.out.println(responseCommonFrame + "         -----------responseCommonFrame");
        StoreOperationRecordsUtils.storeInnerFrameData(deviceCode, "单灯帧-控灯", requestFrame, responseCommonFrame);

        return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
    }

@@ -542,65 +548,68 @@
            LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
            lightTaskPoleRelation.setPoleId(pole.getId());
            lightTaskPoleRelation.setTaskId(lightTask.getTaskId());

            // rrpc 发生定时命令
            if ("FFFF".equals(lightAddress)) {
                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
                lightTaskPoleRelation01.setPoleId(pole.getId());
                lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
                lightTaskPoleRelation01.setLightAddress("0001");

                LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
                lightTaskPoleRelation02.setPoleId(pole.getId());
                lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
                lightTaskPoleRelation02.setLightAddress("0002");

                // 灯头1 rrpc 发生定时命令
                try {
                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
                    //灯头1
                    if (a5LightTimerRespInnerFrame01 == null) {
                        lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    } else {
                        lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
                    }

                } catch (BusinessException e) {
                    lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                }

                //  灯头2 rrpc 发生定时命令
                try {
                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
                    //灯头2
                    if (a5LightTimerRespInnerFrame02 == null) {
                        lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    } else {
                        lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
                    }

                } catch (BusinessException e) {
                    lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                }

                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
            } else {
                lightTaskPoleRelation.setLightAddress(lightAddress);
                // rrpc 发生定时命令
                try {
                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
                    if (a5LightTimerRespInnerFrame == null) {
                        lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    } else {
                        lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
                    }
                } catch (BusinessException e) {
//            if ("FFFF".equals(lightAddress)) {
//                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
//                lightTaskPoleRelation01.setPoleId(pole.getId());
//                lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
//                lightTaskPoleRelation01.setLightAddress("0001");
//
//                LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
//                lightTaskPoleRelation02.setPoleId(pole.getId());
//                lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
//                lightTaskPoleRelation02.setLightAddress("0002");
//
//                // 灯头1 rrpc 发生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
//                    //灯头1
//                    if (a5LightTimerRespInnerFrame01 == null) {
//                        lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    } else {
//                        lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                }
//
//                //  灯头2 rrpc 发生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
//                    //灯头2
//                    if (a5LightTimerRespInnerFrame02 == null) {
//                        lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    } else {
//                        lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                }
//
//                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
//                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
//            } else {
            lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
            lightTaskPoleRelation.setLightAddress(lightAddress);
            // rrpc 发生定时命令
            try {
                A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
                if (a5LightTimerRespInnerFrame == null) {
                    lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                } else {
                    lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
                }
                lightTaskPoleRelationList.add(lightTaskPoleRelation);
            } catch (BusinessException e) {
                e.printStackTrace();
                lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
            }

            lightTaskPoleRelationList.add(lightTaskPoleRelation);
        }

//        }
        return lightTaskPoleRelationList;
    }

@@ -613,6 +622,8 @@
     * @return
     */
    private Map<String, List<LightTaskPoleRelation>> sendControllerFrame(List<Long> poleIdList, String framePayload, String lightAddress) {

        System.out.println("framePayload:" + framePayload);
        List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
        //成功
        List<LightTaskPoleRelation> success = new ArrayList<>();
@@ -637,95 +648,96 @@


            // rrpc 发生定时命令
            if ("FFFF".equals(lightAddress)) {
                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
                lightTaskPoleRelation01.setPoleId(pole.getId());
                lightTaskPoleRelation01.setLightAddress("0001");

                LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
                lightTaskPoleRelation02.setPoleId(pole.getId());
                lightTaskPoleRelation02.setLightAddress("0002");

                // 灯头1 rrpc 发生定时命令
                try {
                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
                    //灯头1
                    if (a5LightTimerRespInnerFrame01 == null) {
                        lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                        fail.add(lightTaskPoleRelation01);
                    } else {
                        lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
                        success.add(lightTaskPoleRelation01);
                    }

                } catch (BusinessException e) {
                    lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    fail.add(lightTaskPoleRelation01);
                }

                //  灯头2 rrpc 发生定时命令
                try {
                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
                    //灯头2
                    if (a5LightTimerRespInnerFrame02 == null) {
                        lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                        fail.add(lightTaskPoleRelation02);
                    } else {
                        lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
                        success.add(lightTaskPoleRelation02);
                    }

                } catch (BusinessException e) {
                    lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    fail.add(lightTaskPoleRelation02);
                }

                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
            } else {
                lightTaskPoleRelation.setLightAddress(lightAddress);
                // rrpc 发生定时命令
                try {
                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
                    if (a5LightTimerRespInnerFrame == null) {
                        lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                        fail.add(lightTaskPoleRelation);
                    } else {
                        lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
                        success.add(lightTaskPoleRelation);
                    }
                } catch (BusinessException e) {
//            if ("FFFF".equals(lightAddress)) {
//                LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
//                lightTaskPoleRelation01.setPoleId(pole.getId());
//                lightTaskPoleRelation01.setLightAddress("0001");
//
//                LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
//                lightTaskPoleRelation02.setPoleId(pole.getId());
//                lightTaskPoleRelation02.setLightAddress("0002");
//
//                // 灯头1 rrpc 发生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
//                    //灯头1
//                    if (a5LightTimerRespInnerFrame01 == null) {
//                        lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                        fail.add(lightTaskPoleRelation01);
//                    } else {
//                        lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
//                        success.add(lightTaskPoleRelation01);
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    fail.add(lightTaskPoleRelation01);
//                }
//
//                //  灯头2 rrpc 发生定时命令
//                try {
//                    A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
//                    //灯头2
//                    if (a5LightTimerRespInnerFrame02 == null) {
//                        lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                        fail.add(lightTaskPoleRelation02);
//                    } else {
//                        lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
//                        success.add(lightTaskPoleRelation02);
//                    }
//
//                } catch (BusinessException e) {
//                    lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
//                    fail.add(lightTaskPoleRelation02);
//                }
//
//                lightTaskPoleRelationList.add(lightTaskPoleRelation01);
//                lightTaskPoleRelationList.add(lightTaskPoleRelation02);
//            } else {
            lightTaskPoleRelation.setLightAddress(lightAddress);
            lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
            // rrpc 发生定时命令
            try {
                A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
                if (a5LightTimerRespInnerFrame == null) {
                    lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    fail.add(lightTaskPoleRelation);
                } else {
                    lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
                    success.add(lightTaskPoleRelation);
                }
                lightTaskPoleRelationList.add(lightTaskPoleRelation);
            } catch (BusinessException e) {
                lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                fail.add(lightTaskPoleRelation);
            }

            lightTaskPoleRelationList.add(lightTaskPoleRelation);
        }

//        }
        map.put("success", success);
        map.put("fail", fail);
        map.put("all", lightTaskPoleRelationList);
        log.error("发送控制器帧结果：{}", map);
        return map;
    }


    @Transactional(rollbackFor = Exception.class)
    public boolean delLightTask(List<Long> taskIdList) {
    public String delLightTask(List<Long> taskIdList) {
        List<LightTask> lightTaskList = listByIds(taskIdList);
        if (CollectionUtil.isEmpty(lightTaskList)) {
            throw new BusinessException("找不到任务信息");
        }

        List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
        if (list.size() != 0) {
            throw new BusinessException("删除任务失败，删除的任务有灯杆正在使用");
        }
        //取出任务关系
        List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));

        // 删除任务
        if (!removeByIds(taskIdList)) {
            throw new BusinessException("删除任务失败");
        }
        //取出灯杆id
        List<Long> poleIds = relations.stream().map(LightTaskPoleRelation::getPoleId).distinct().collect(Collectors.toList());

        //下发清除任务指令
//        boolean b = clearLightTask(lightTaskIds);
        Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", "FFFF");
        /**
         * 删除控灯任务日志记录开始
         */
@@ -734,7 +746,30 @@
        /**
         * 删除控灯任务日志记录结束
         */
        return true;
        if (ffff.get("fail").size() == 0) {
            //全部清除成功  删除全部任务关系
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
            //删除任务
            removeByIds(taskIdList);
            return "任务删除成功";
        } else {
            //部分清除成功   删除成功部分的任务关系
            ffff.get("success").forEach(lightTaskPoleRelation -> {
                lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
                        .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, lightTaskPoleRelation.getTaskId()));
            });
            //删除任务
            lightTaskList.forEach(
                    taskId -> {
                        List<LightTaskPoleRelation> poleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
                        if (poleRelations.size() == 0) {
                            //不存在任务关系   删除任务
                            removeById(taskId);
                        }
                    }
            );
            return "部分任务删除成功,清除任务失败的任务及数据保留";
        }
    }

    /**
@@ -898,4 +933,41 @@

        }
    }

    public boolean clearLightTask(List<Long> poleIds) {
        Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", "FFFF");
        ffff.get("success").forEach(lightTaskPoleRelation -> {
            lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, lightTaskPoleRelation.getTaskId()));
        });
        return true;
    }


    public Map checkTask(LightTaskParam param) {
        /**
         * 重复任务的灯头
         */
        String lightAddress = param.getLightAddress();
        List<Long> poleIdList = param.getPoleIdList();
        List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
        List<Long> taskIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
        List<Long> poleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
        //poleIds中重复元素只保留一个
        taskIds = taskIds.stream().distinct().collect(Collectors.toList());
        poleIds = poleIds.stream().distinct().collect(Collectors.toList());
        Map map = new HashMap();
        if (!lightTaskPoleRelations.isEmpty()) {

            map.put("request", "false");
            map.put("msg", "任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
                    + "灯杆id为{" + poleIds + "}");
//            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + taskIds + "}, "
//                    + "灯杆id为{" + poleIds + "}");
        } else {
            map.put("request", "true");
            map.put("msg", "任务中无重复灯杆地址");
        }
        return map;
    }
}