changes

liuhaonan

2022-07-07 2ac07c17cd4176fd61bed3a8c09ea192b7d89be7

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java

@@ -37,12 +37,7 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.addLightTask(param);
        if (result) {
            return ResponseUtil.success("新增成功");
        } else {
            return ResponseUtil.fail("新增失败");
        }
            return ResponseUtil.success(lightTaskService.newAddLightTask(param));
    }



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

@@ -6,7 +6,6 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -67,39 +66,42 @@
    private final ClientService clientService;
    private final LightEnergyDataService lightEnergyDataService;


    /**
     * 新增路灯任务
     * @param param
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean addLightTask(LightTaskParam param) {
    public String newAddLightTask(LightTaskParam param) {
        if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
            throw new BusinessException("灯控命令格式不正确");
        }
//        LightTask lightTask = getById(null);


        int week = 0;
        for (Integer w : param.getWeekList()) {
            week |= w;
        }
        LightTask lightTask = new LightTask();
        if (SecurityUtils.getClientId() != null) {
            lightTask.setClientId(clientService.getClientId());
            lightTask.setUserId(SecurityUtils.getUserId());
        }
        lightTask.setTaskName(param.getTaskName());
        lightTask.setWeek(week);
        lightTask.setLightAdress(param.getLightAddress());
        lightTask.setCloseOrder(param.getCloseOrder());
        lightTask.setOpenOrder(param.getOpenOrder());
        lightTask.setControlOrder(param.getControlOrder());
        lightTask.setCreateUser(SecurityUtils.getUsername());
        lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
        if (!save(lightTask)) {

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

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

        newLightTask.setWeek(week);
        newLightTask.setCreateUser(SecurityUtils.getUsername());
        newLightTask.setControlOrder(param.getControlOrder());
        newLightTask.setOpenOrder(param.getOpenOrder());
        newLightTask.setCloseOrder(param.getCloseOrder());
        newLightTask.setLightAdress(param.getLightAddress());
        newLightTask.setUpdateTime(LocalDateTime.now());
        newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
        if (!save(newLightTask)) {
            throw new BusinessException("保存路灯任务失败");
        }


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


        //传入的灯杆id集合
        List<Long> poleIdList = param.getPoleIdList();
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
        //记录这些灯杆原先的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<>();
        if (!newPoleIdList.isEmpty()) {
            //新灯杆下发新任务
            newPoleMap = sendControllerFrame(newLightTask, newPoleIdList, 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> 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<Long> poleIdList = param.getPoleIdList();
        if (CollectionUtil.isNotEmpty(poleIdList)) {
        String content1 = "{任务ID：" + newLightTask.getTaskId() + "， 任务名：" + newLightTask.getTaskName() + "}," + " 灯杆ID：" + param.getPoleIdList().toString() + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "下发路灯任务", content1);
        /**
         * 下发路灯任务日志记录结束
         */

            List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
        List<LightTaskPoleRelation> all = new ArrayList<>();
        all.addAll(newPoleMap);
        all.addAll(oldPoleSuccess);
        //旧灯杆下发失败不需要保存信管系

            // 添加绑定灯杆
            if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
                throw new BusinessException("绑定灯杆失败");
            }

            // 一个灯杆只能使用一个任务，新任务要覆盖旧任务
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));

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

            String content1 = "{任务ID：" + lightTask.getTaskId() + "， 任务名：" + lightTask.getTaskName() + "}," + " 灯杆ID：" + param.getPoleIdList().toString() + " }";
            StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "下发路灯任务", content1);
            /**
             * 下发路灯任务日志记录结束
             */
        //删除旧灯杆中覆盖成功的任务id
        List<Long> oldSuccessPoleId = new ArrayList<>();
        for (LightTaskPoleRelation bean : oldPoleSuccess) {
            oldSuccessPoleId.add(bean.getPoleId());
        }
        return true;
        if (!oldSuccessPoleId.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId));

        }

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

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


    }


    @Transactional(rollbackFor = Exception.class)
    public String updateLightTask(Long taskId, LightTaskParam param) {
@@ -362,7 +428,7 @@
        String orderBy = orderByResult + " " + orderBySeq;

        PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
        List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);
        List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(), keyword, orderBy);


        Page<LightTaskDto> page = new Page<>();