changes

liuhaonan

2022-08-12 b9e1aef87da450d99587b56dbb31323fc6e0f3ea

changes

 dao/src/main/java/com/sandu/ximon/dao/domain/LightTask.java

@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

import lombok.Data;

/**
 * 路灯任务表

 dao/src/main/java/com/sandu/ximon/dao/domain/LightTaskPoleRelation.java

@@ -18,7 +18,7 @@
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
//    @TableId(type = IdType.AUTO)
    private Long id;

    /**
@@ -32,6 +32,11 @@
    private Long poleId;

    /**
     * 灯头地址
     */
    private String lightAddress;

    /**
     * 任务下发状态，0成功，1校验码错误，2长度错误，3写flash错误，255其他错误
     */
    private Integer issueStatus;

 dao/src/main/java/com/sandu/ximon/dao/domain/Pole.java

@@ -37,7 +37,7 @@
    private String poleName;

    /**
     * 设备类型  01 是CAT1 00 是MQTT串口主板
     * 设备类型  -1 虚拟灯杆 01 是CAT1 00 是MQTT串口主板
     */
    private Integer deviceType;


 dao/src/main/resources/mapper/LightTaskMapper.xml

@@ -83,7 +83,8 @@
        WHERE
        1=1
        <if test="keyword != null and keyword != ''">
            AND ( t1.task_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR t5.device_code LIKE CONCAT(CONCAT('%', #{keyword}), '%'))
            AND ( t1.task_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR t5.device_code LIKE CONCAT(CONCAT('%',
            #{keyword}), '%'))
        </if>
        <if test="userId != null">
            AND ( t1.client_id =#{userId} OR t1.user_id =#{userId} )

 dao/src/main/resources/mapper/LightTaskPoleRelationMapper.xml

@@ -8,6 +8,7 @@
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="taskId" column="task_id" jdbcType="BIGINT"/>
        <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
        <result property="lightAddress" column="light_address" jdbcType="VARCHAR"/>
        <result property="issueStatus" column="issue_status" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>

 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/LightTaskDto.java

@@ -18,4 +18,14 @@
     * 同步状态
     */
    private String syncStatus;

    /**
     * 灯头1是否执行
     */
    private Boolean light1 = false;

    /**
     * 灯头2是否执行
     */
    private Boolean light2 = false;
}

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

@@ -1031,13 +1031,21 @@
        lights.forEach(light -> {
            light.setPower1(lightPowerSettingParam.getPower1());
            light.setPower2(lightPowerSettingParam.getPower2());
            if (lightPowerSettingParam.getPower1() != null) {
            //存在非0功率  即为存在该灯头
            if (lightPowerSettingParam.getPower1() != null || lightPowerSettingParam.getPower1() != 0) {
                light.setLight1(1);
            } else if (lightPowerSettingParam.getPower1() == 0) {
                //手动设置灯头功率为0  即不存在该灯头
                light.setLight1(0);
            } else {
                light.setLight1(0);
            }
            if (lightPowerSettingParam.getPower2() != null) {
            //存在非0功率  即为存在该灯头
            if (lightPowerSettingParam.getPower2() != null || lightPowerSettingParam.getPower2() != 0) {
                light.setLight2(1);
            } else if (lightPowerSettingParam.getPower2() == 0) {
                //手动设置灯头功率为0  即不存在该灯头
                light.setLight2(0);
            } else {
                light.setLight2(0);
            }

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

@@ -69,6 +69,7 @@

    /**
     * 新增路灯任务
     *
     * @param param
     * @return
     */
@@ -99,6 +100,7 @@
        newLightTask.setLightAdress(param.getLightAddress());
        newLightTask.setUpdateTime(LocalDateTime.now());
        newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));

        if (!save(newLightTask)) {
            throw new BusinessException("保存路灯任务失败");
        }
@@ -116,7 +118,21 @@
        //传入的灯杆id集合
        List<Long> poleIdList = param.getPoleIdList();
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
        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");
            }));
        } else {
            oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
        }

        /**
         * 重复任务的灯头
         */
        if (!oldLightTaskStatusAndPoles.isEmpty()) {
            throw new BusinessException("任务中存在已有任务的单灯," + "任务id为{" + oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList()) + "}, " + "灯杆id为{" + oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList()) + "}");
        }
        //记录这些灯杆原先的id
        List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());

@@ -126,6 +142,19 @@
        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()) {
@@ -144,11 +173,9 @@
        }
        //覆盖成功 添加新的任务关系
        if (!oldPoleSuccess.isEmpty()) {
            oldPoleSuccess.forEach(
                    success -> {
                        success.setTaskId(newLightTask.getTaskId());
                    }
            );
            oldPoleSuccess.forEach(success -> {
                success.setTaskId(newLightTask.getTaskId());
            });
        }

        //判断旧灯杆覆盖操作是否存在失败  如果存在失败，则保存旧的任务关系
@@ -157,8 +184,7 @@
            //获取失败的灯杆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());
            failOldLightTaskStatusAndPoles = oldLightTaskStatusAndPoles.stream().filter(lightTaskPoleRelation -> failPoleIdList.contains(lightTaskPoleRelation.getPoleId())).collect(Collectors.toList());
        }

        /**
@@ -182,12 +208,17 @@
            oldSuccessPoleId.add(bean.getPoleId());
        }
        if (!oldSuccessPoleId.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId));
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId).eq(LightTaskPoleRelation::getTaskId, oldLightTaskStatusAndPoles.get(0).getTaskId()));

        }

        //保存新灯杆以及旧灯杆覆盖成功的任务关系
        if (!all.isEmpty()) {
//            all.forEach(
//                    bean->{
//                        lightTaskPoleRelationService.save(bean);
//                    }
//            );
            lightTaskPoleRelationService.saveBatch(all);
        }

@@ -251,6 +282,40 @@
        List<Long> closeLight = oldList.stream().filter(poleId -> !param.getPoleIdList().contains(poleId)).collect(Collectors.toList());


        //取出覆盖操作的关系信息
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldRelation;
        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));
        } else {
            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 + "}");
        }


        List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
        List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
        List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
@@ -276,7 +341,7 @@
        List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
        List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(closeLight)) {
            //执行关灯内帧
            //关灯内帧
            String framePayloadClose = "7f0000007f173b00";
            //覆盖操作灯杆
            Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
@@ -372,7 +437,7 @@
            return "编辑成功";
        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
            throw new BusinessException("编辑失败,请检查编辑的设备是否在线!");
        } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
        } else if (!closePoleFail.isEmpty() /*|| !oldPoleFail.isEmpty()*/) {
            return "原任务中存在下发异常，原任务保留，创建新任务进行保存";
        } else if (!newPoleFail.isEmpty()) {
            return "新任务中存在下发异常，忽略异常操作的灯杆";
@@ -437,6 +502,11 @@
            LightTaskDto lightTaskDto = new LightTaskDto();
            BeanUtils.copyProperties(lightTask, lightTaskDto);
            lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));


            //判断灯头是否存在任务
            List<LightTaskPoleRelation> lightTaskPoleRelationList = lightTaskPoleRelationService.list(Wrappers.<LightTaskPoleRelation>lambdaQuery().eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));

            //下发成功的灯杆数量
            Integer successCount = baseMapper.successCount(lightTaskDto.getTaskId());
            ///任务中总的灯杆数量
@@ -514,22 +584,71 @@
        }

        for (Pole pole : poles) {
            if (pole.getDeviceCode() == null || pole.getDeviceCode().equals("")) {
                removeById(lightTask.getTaskId());
                throw new BusinessException("灯杆不存在mac,不能下发任务   请检查灯杆是否存在单灯");
            }
            LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
            lightTaskPoleRelation.setPoleId(pole.getId());
            lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
            // 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()));
            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());
                }
            } catch (BusinessException e) {
                lightTaskPoleRelation.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) {
                    lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                }
                lightTaskPoleRelationList.add(lightTaskPoleRelation);
            }

            lightTaskPoleRelationList.add(lightTaskPoleRelation);
        }
        return lightTaskPoleRelationList;
    }
@@ -557,25 +676,80 @@
        }

        for (Pole pole : poles) {
            if (pole.getDeviceCode() == null || pole.getDeviceCode().equals("")) {
                throw new BusinessException("灯杆不存在mac,不能下发任务   请检查灯杆是否存在单灯");
            }
            LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
            lightTaskPoleRelation.setPoleId(pole.getId());
//            lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
            //关系表插入灯头地址
            lightTaskPoleRelation.setLightAddress(lightAddress);


            // rrpc 发生定时命令
            try {
                A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
                if (a5LightTimerRespInnerFrame == null) {
            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) {
                    lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                    fail.add(lightTaskPoleRelation);
                } else {
                    lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
                    success.add(lightTaskPoleRelation);
                }
            } catch (BusinessException e) {
                lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
                fail.add(lightTaskPoleRelation);
                lightTaskPoleRelationList.add(lightTaskPoleRelation);
            }

            lightTaskPoleRelationList.add(lightTaskPoleRelation);
        }
        map.put("success", success);
        map.put("fail", fail);