changes

liuhaonan

2022-10-12 6fe040e3e2805c28442090221e9a4597381830d9

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

@@ -2,10 +2,11 @@

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -28,8 +29,9 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskPoleRelationBo;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.admin.vo.LightTaskInfoVO;
import com.sandu.ximon.admin.vo.LightTaskRelationVO;
import com.sandu.ximon.admin.vo.LightTaskVO;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
@@ -37,7 +39,6 @@
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
import com.sandu.ximon.dao.mapper.LightTaskPoleRelationMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -82,7 +83,6 @@
        if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
            throw new BusinessException("灯头地址格式不正确");
        }
//        LightTask lightTask = getById(null);


        int week = 0;
@@ -93,7 +93,7 @@
        LightTask newLightTask = new LightTask();
        newLightTask.setTaskName(param.getTaskName());

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

        newLightTask.setWeek(week);
@@ -143,16 +143,11 @@
        newPoleMap.forEach(
                commend -> {
                    //开关灯时间
                    String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
                    if (newLightTask.getControlOrder() != null) {
                        //控灯时间
                        s = s + newLightTask.getControlOrder();
                    }
                    // 更新系统定时
                    commend.setSysScheduled(s);
                    commend.setSysScheduled(JSON.toJSONString(newLightTask));
                    System.out.println(commend.getIssueStatus() + "状态");
                    if (commend.getIssueStatus() == 0) {
                        //下发成功  更新系统定时和硬件定时
                        commend.setDeviceScheduled(s);
                        commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
                    } else {
                        //下发失败  更新系统定时  保留硬件定时 硬件定时
//                        commend.setSysScheduled(s);
@@ -181,7 +176,7 @@

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

        boolean b = true;
        //保存任务关系
@@ -211,6 +206,9 @@
        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 newLightTask = getById(taskId);
        if (newLightTask == null) {
            throw new BusinessException("找不到路灯任务");
@@ -222,10 +220,9 @@
            week |= w;
        }

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

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

        newLightTask.setWeek(week);
@@ -338,32 +335,47 @@
        all.addAll(newPoleFail);
        all.addAll(oldPoleSuccess);
        all.addAll(oldPoleFail);
        all.addAll(closePoleSuccess);
        all.addAll(closePoleFail);


        if (closePoleFail.size() != 0) {
            List<LightTaskPoleRelation> colesFail = new ArrayList<>();
            //原来任务中本身就下发失败的任务  即硬件定时为空    编辑后进行关灯操作   可直接剔除任务关系
            closePoleFail.forEach(
                    close -> {
                        relations.forEach(
                                task -> {
                                    System.out.println(task.getLightAddress().equals(close.getLightAddress()) + "   addressResult");
                                    System.out.println(close.getLightAddress() + "   close.getLightAddress()");
                                    if (task.getLightAddress().equals(close.getLightAddress()) && task.getDeviceCode().equals(close.getDeviceCode())
                                            && task.getDeviceScheduled() != null && !task.getDeviceScheduled().isEmpty()) {
                                        colesFail.add(close);
                                    }
                                }
                        );
                        all.addAll(colesFail);
                    }
            );

        }


        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);
                        commend.setSysScheduled(JSON.toJSONString(newLightTask));
                        commend.setTaskId(taskId);
                        // 先设置硬件定时为上次的硬件定时   不论成功失败
                        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);
                                    commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
                                }

                            }
                        });

@@ -374,10 +386,14 @@

        //编辑前后所有的灯杆ID集合
        poleIdList.addAll(oldList);
        if (!poleIdList.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
        //去重
        List<Long> collect = poleIdList.stream().distinct().collect(Collectors.toList());
        if (!collect.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                    .in(LightTaskPoleRelation::getPoleId, collect).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));

        }


        if (!all.isEmpty()) {
            b = lightTaskPoleRelationService.saveBatch(all);
@@ -548,48 +564,6 @@
            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.setDeviceCode(pole.getDeviceCode());
            lightTaskPoleRelation.setLightAddress(lightAddress);
            // rrpc 发生定时命令
@@ -646,52 +620,6 @@


            // 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);
            lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
            // rrpc 发生定时命令
@@ -711,7 +639,6 @@
            lightTaskPoleRelationList.add(lightTaskPoleRelation);
        }

//        }
        map.put("success", success);
        map.put("fail", fail);
        map.put("all", lightTaskPoleRelationList);
@@ -721,65 +648,110 @@


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

        //取出任务关系
        List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
        List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));

        //取出灯杆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");
        /**
         * 删除控灯任务日志记录开始
         */
        String content = "{控灯任务id：" + taskIdList + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "删除控灯任务", content);
        /**
         * 删除控灯任务日志记录结束
         */
        if (ffff.get("fail").size() == 0) {
            //全部清除成功  删除全部任务关系
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
            //删除任务
            removeByIds(taskIdList);
            return "任务删除成功";
        if (poleIds != null && poleIds.size() > 0) {
            //存在任务关系   下发清除任务指令
            Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());

            /**
             * 删除控灯任务日志记录开始
             */
            String content = "{控灯任务id：" + taskId + " }";
            StoreOperationRecordsUtils.storeOperationData(null, null, "删除控灯任务", content);
            /**
             * 删除控灯任务日志记录结束
             */
            if (ffff.get("fail").size() == 0) {
                //全部清除成功  删除全部任务关系
                lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
                //删除任务
                removeById(taskId);
                return "任务删除成功";
            } else if (ffff.get("success").size() != ffff.get("all").size()) {
                //部分成功  删除成功部分的关系  保留任务
                List<LightTaskPoleRelation> relations1 = ffff.get("success");
                if (relations1 != null && relations1.size() > 0) {
                    relations1.forEach(lightTaskPoleRelation -> {
                        lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
                                .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, taskId));
                    });
                }
                return "部分任务删除成功,清除任务失败的任务及数据保留!";
            } else if (ffff.get("fail").size() == ffff.get("all").size()) {
                //全部失败  保留任务
                return "任务删除失败 ,请检查硬件设备!";
            } else {
                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 "部分任务删除成功,清除任务失败的任务及数据保留";
            //不存在任务关系    空任务直接删除
            removeById(taskId);
            return "任务删除成功";
        }
    }

    /**
     * 任务详情
     */
    public Map<Object, Object> detailLightTask(Long taskId) {
    public Object detailLightTask(Long taskId) {
        LightTask lightTask = getById(taskId);
        if (lightTask == null) {
            throw new BusinessException("找不到任务");
        }
        List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
        return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
        LightTaskInfoVO vo = new LightTaskInfoVO();

//        LightTaskDto lightTaskDto = new LightTaskDto();
//        BeanUtils.copyProperties(lightTask, lightTaskDto);

        lightTask.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));

        vo.setLightTask(lightTask);
        List<LightTaskRelationVO> relations = new ArrayList<>();
        List<LightTaskPoleRelation> taskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .eq(LightTaskPoleRelation::getTaskId, taskId));
        if (taskPoleRelations != null && !taskPoleRelations.isEmpty()) {
            taskPoleRelations.forEach(
                    relation -> {
                        LightTaskRelationVO lightTaskRelationVO = new LightTaskRelationVO();
                        lightTaskRelationVO.setLightAddress(relation.getLightAddress());
                        lightTaskRelationVO.setIssueStatus(relation.getIssueStatus());
                        lightTaskRelationVO.setPoleId(relation.getPoleId());
                        Pole byId = poleService.getById(relation.getPoleId());
                        if (byId != null) {
                            lightTaskRelationVO.setPoleName(byId.getPoleName());
                        }

                        LightTaskVO sys = JSONObject.parseObject(relation.getSysScheduled(), LightTaskVO.class);
                        sys.setWeekList(TaskOrderUtil.parseLightWeek2List(sys.getWeek()));
                        lightTaskRelationVO.setSysScheduled(sys);

                        LightTaskVO device = JSONObject.parseObject(relation.getDeviceScheduled(), LightTaskVO.class);
                        if (device != null) {
                            device.setWeekList(TaskOrderUtil.parseLightWeek2List(device.getWeek()));
                            lightTaskRelationVO.setDeviceScheduled(device);
                        }
                        relations.add(lightTaskRelationVO);
                    }
            );

            vo.setRelations(relations);
        }

//        List<LightTaskStatusAndPole> lightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);

//        return MapUtil.builder().put("task", lightTask).put("poles", lightTaskStatusAndPoles).build();
        return vo;
    }

    /**
@@ -834,11 +806,21 @@
     * 下发单个灯杆的任务
     */
    public boolean issueLightTask(LightTaskIssueParam param) {
        LightTask lightTask = getById(param.getTaskId());

        LightTaskPoleRelation relation = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                .eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));

        if (relation == null) {
            throw new BusinessException("找不到任务关系,无法补发");
        }
        LightTask lightTask = JSONObject.parseObject(relation.getSysScheduled(), LightTask.class);
//        LightTask lightTask = getById(param.getTaskId());
        if (lightTask == null) {
            throw new BusinessException("找不到任务");
        }
        //转换帧指令
        String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
        //发送rrpc  得到发送结果
        List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());

        /**
@@ -857,11 +839,17 @@


        if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
            return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
            LightTaskPoleRelation lightTaskPoleRelation = lightTaskPoleRelationList.get(0);
            if (lightTaskPoleRelation.getIssueStatus() == 0) {
                //下发成功  更新硬件定时  返回成功
                relation.setDeviceScheduled(JSON.toJSONString(lightTaskPoleRelation));
                lightTaskPoleRelationService.updateById(relation);
                return true;
            } else {
                return false;
            }
        }


        return true;
        return false;
    }


@@ -869,46 +857,31 @@
     * 计算功率及能耗
     */
    public void energy() {
        List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));

        List<Long> taskIdList = new ArrayList<>();
        for (LightTask bean : lightTasks) {
            taskIdList.add(bean.getTaskId());
        }
        if (taskIdList.size() != 0) {
            List<LightTaskPoleRelationBo> list = SpringContextHolder.getBean(LightTaskPoleRelationMapper.class).test(taskIdList);
            for (LightTaskPoleRelationBo bean : list) {

        //所有存在任务的灯杆关系
        List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list();
        for (LightTaskPoleRelation bean : list) {
            if (bean.getDeviceScheduled() != null) {
                //存在硬件任务
                LightTask lightTask = JSONObject.parseObject(bean.getDeviceScheduled(), LightTask.class);
                LightTaskDto lightTaskDto = new LightTaskDto();
                BeanUtils.copyProperties(bean, lightTaskDto);
                lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(bean.getWeek()));
                BeanUtils.copyProperties(lightTask, lightTaskDto);
                lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
                BigDecimal energySaving;
                BigDecimal energy;
                //获取昨天的星期数
                LocalDateTime now = LocalDateTime.now();
                LocalDateTime yesterday = now.minusDays(1);
                int week = yesterday.getDayOfWeek().getValue();
                if (!list.isEmpty()) {
                    //有绑定灯杆  进行计算
                    if (lightTaskDto.getWeekList().contains(week)) {
                        //任务有该星期数  计算
                        energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
                        energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
                    } else {
                        //任务无该星期数  返回
                        energySaving = new BigDecimal(1);
                        energy = BigDecimal.ZERO;
                    }
                    for (int i = 0; i < list.size(); i++) {
                        LightTaskPoleRelation relation = list.get(i);
                        if (relation.getIssueStatus() != 0) {
                            //任务下发失败  返回
                            energySaving = new BigDecimal(1);
                            energy = BigDecimal.ZERO;
                        }
                    }

                if (lightTaskDto.getWeekList().contains(week)) {
                    //任务有该星期数  计算
                    energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto, bean);
                    energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto, bean);
                    System.out.println("能耗: " + energy + ", 节能率: " + energySaving);
                } else {
                    //未绑定灯杆  直接返回
                    //任务无该星期数  返回
                    energySaving = new BigDecimal(1);
                    energy = BigDecimal.ZERO;
                }
@@ -917,19 +890,22 @@
                 * 存储数据
                 */

                System.out.println("能耗: " + energy + ", 节能率: " + energySaving);
                LightEnergyData lightEnergyData = new LightEnergyData();
                lightEnergyData.setTaskId(bean.getTaskId());
                lightEnergyData.setTaskId(lightTask.getTaskId());
                lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                lightEnergyData.setEnergySaving(energySaving);
                lightEnergyData.setEnergy(energy);
                lightEnergyData.setUserId(bean.getUserId());
                lightEnergyData.setClientId(bean.getClientId());
                lightEnergyData.setLightAdderss(lightTask.getLightAdress());
                lightEnergyData.setUserId(lightTask.getUserId());
                lightEnergyData.setClientId(lightTask.getClientId());
                lightEnergyData.setPoleId(bean.getPoleId());
                //保存能耗数据到数据库
                lightEnergyDataService.save(lightEnergyData);
            }

        }


    }

    public boolean clearLightTask(List<Long> poleIds) {
@@ -948,22 +924,29 @@
        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()));
                .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, lightAddress));
        //重复的任务id
        List<Long> taskIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
        List<Long> poleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
        //poleIds中重复元素只保留一个
        //重复的灯杆id
        List<Long> oldPoleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
        //未重复的灯杆id
        List<Long> finalOldPoleIds = oldPoleIds;
        //取出存在于poleIdList而不在oldPoleIds中的灯杆
        List<Long> newPoleIds = poleIdList.stream().filter(id -> !finalOldPoleIds.contains(id)).collect(Collectors.toList());

        //重复元素只保留一个
        taskIds = taskIds.stream().distinct().collect(Collectors.toList());
        poleIds = poleIds.stream().distinct().collect(Collectors.toList());
        oldPoleIds = oldPoleIds.stream().distinct().collect(Collectors.toList());
        newPoleIds = newPoleIds.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 + "}");
            map.put("result", "false");
            map.put("newPoleIds", newPoleIds);
            map.put("oldPoleIds", oldPoleIds);
            map.put("taskIds", taskIds);
        } else {
            map.put("request", "true");
            map.put("result", "true");
            map.put("msg", "任务中无重复灯杆地址");
        }
        return map;