fix

zhanzhiqin

2022-05-27 dd15d2d4407c4ace0cfad1c9d5f00ed0ea49557f

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

@@ -30,10 +30,12 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -43,10 +45,8 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -63,6 +63,7 @@
    private final LightTaskPoleRelationService lightTaskPoleRelationService;
    private final LightTaskMapper lightTaskMapper;
    private final ClientService clientService;
    private final LightEnergyDataService lightEnergyDataService;

    /**
     * 新增路灯任务
@@ -104,12 +105,7 @@
                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：" + lightTask.getTaskId() + "， 任务名：" + lightTask.getTaskName() + "}，{内帧指令" + lightTask.getFramePayload() + "， 灯杆ID：" + param.getPoleIdList().toString() + "， 控制的灯头地址：" + param.getLightAddress() + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "新增路灯任务", content);
        /**
         * 新增路灯任务日志记录结束
@@ -132,10 +128,7 @@
             * 下发路灯任务日志记录开始
             */

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

    @Transactional(rollbackFor = Exception.class)
    public boolean updateLightTask(Long taskId, LightTaskParam param) {
    public String updateLightTask(Long taskId, LightTaskParam param) {
        if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
            throw new BusinessException("灯控命令格式不正确");
        }
@@ -153,10 +146,6 @@
        if (lightTask == null) {
            throw new BusinessException("找不到路灯任务");
        }


        //记录任务编辑器前灯杆ID
        List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);


        int week = 0;
@@ -179,8 +168,64 @@
        newLightTask.setUpdateTime(LocalDateTime.now());
        newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));

        if (!save(newLightTask)) {
            throw new BusinessException("编辑任务失败");

        //编辑后灯杆ID集合
        List<Long> poleIdList = param.getPoleIdList();
        //记录任务编辑器前灯杆ID集合
        List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
        List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskStatusAndPole::getId).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());


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

            //newPoleAll集合后面用于存储关系表
            newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
            newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
            newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
        }

        List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
        List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
            //覆盖操作灯杆
            Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
            oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
            oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
        }

        List<LightTaskPoleRelation> 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());
            closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
            closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
        }


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

        /**
@@ -193,109 +238,112 @@
                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：" + param.getPoleIdList().toString() + "， 控制的灯头地址：" + param.getLightAddress() + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "编辑路灯任务", content);
        /**
         * 编辑路灯任务日志记录结束
         */

        List<Long> poleIdList = param.getPoleIdList();
        if (CollectionUtil.isNotEmpty(poleIdList)) {
            List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(newLightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
            //状态不为0 新建任务
            lightTaskPoleRelationList.forEach(
                    taskResult -> {
                        //保存下发失败的任务关联关系，状态为O成功，其他状态都为失败
                        if (taskResult.getIssueStatus() == 0) {
                            for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
                                if (bean.getId().equals(taskResult.getPoleId())) {
                                    oldLightTaskStatusAndPoles.remove(bean);
                                    break;
                                }
                            }
                        }
                    }
            );
            //修改灯杆任务绑定关系表
            for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
                //成功才修改，失败不变
                if (bean.getIssueStatus() == 0) {

                    LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
                    if (one != null) {
                        one.setTaskId(newLightTask.getTaskId());
                        lightTaskPoleRelationService.updateById(one);
                    } else {
                        lightTaskPoleRelationService.save(bean);
                    }
                }
            }

            List<Long> failPoleId = new ArrayList<>();
            for (LightTaskStatusAndPole bean1 : oldLightTaskStatusAndPoles) {
                failPoleId.add(bean1.getId());
            }
            //执行关灯
            String framePayloadClose = "7f0000007f173b00";

            List<LightTaskPoleRelation> lightTaskPoleRelations = new ArrayList<>();
            if (!failPoleId.isEmpty()) {
                lightTaskPoleRelations = sendControllerFrame(lightTask, failPoleId, framePayloadClose, lightTask.getLightAdress());
            }

            //状态不为0 新建任务
            lightTaskPoleRelations.forEach(
                    taskResult -> {
                        //保存下发失败的任务关联关系，状态为O成功，其他状态都为失败
                        if (taskResult.getIssueStatus() == 0) {
                            for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
                                if (bean.getId().equals(taskResult.getPoleId())) {
                                    oldLightTaskStatusAndPoles.remove(bean);
                                    lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                                            .eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()).eq(LightTaskPoleRelation::getPoleId, bean.getId()));
                                    break;
                                }
                            }
                        }
                    }
            );


            //任务顺利完成
            if (oldLightTaskStatusAndPoles.size() == 0) {
                removeById(lightTask);
            }


//            // 添加绑定灯杆
//            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);
            /**
             * 下发路灯任务日志记录结束
             */
        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());
        }

        return true;
        //失败用旧的任务ID
        for (LightTaskPoleRelation bean : closePoleFail) {
            bean.setTaskId(lightTask.getTaskId());
        }

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


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

        if (!allPoleId.isEmpty()) {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));

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


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

//        if (oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
//            //全部成功
//            return 0;
//        } else if (!closeLight.isEmpty() || !oldPoleFail.isEmpty()) {
//            //关灯失败  或者覆盖任务失败
//            return 1;
//        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closeSuccess.isEmpty()) {
//            //编辑全部失败
//            return 2;
//        } else {
//            //其他情况
//            return -1;
//        }

//        if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
//            //编辑成功
//            return 0;
//        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
//            //编辑失败
//            return 1;
//        } else {
//            //在旧任务基础上编辑
//            if (lightTask.getTaskId().equals(newLightTask.getTaskId())) {
//                //只有旧任务
//                return 2;
//            }  else {
//                //有新任务，有旧任务
//                return 3;
//            }
//        }

        if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
            return "编辑成功";
        } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
            throw new BusinessException("编辑失败");
        } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
            return "原任务中存在下发异常，原任务保留，创建新任务进行保存";
        } else if (!newPoleFail.isEmpty()) {
            return "新任务中存在下发异常，忽略异常操作的灯杆";
        } else {
            return "操作异常";
        }
    }


    /**
     * 发送灯控请求
@@ -305,14 +353,15 @@
     * @return 返回帧
     */
    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();
        WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
        IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload, lightAddress)).orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build();
        WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);

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

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

    public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword) {
    public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword, Integer order, Integer seq) {
        LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
        if (StrUtil.isNotBlank(keyword)) {
            wrapper.like(LightTask::getTaskName, keyword);
@@ -324,9 +373,34 @@
            });
        }

        if (conditionVO != null) {
            PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
        //排序字段
        String orderByResult = OrderByEnums.LIGHT_TASK_UPDATE_TIME.getCode();
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.LIGHT_TASK_UPDATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = OrderByEnums.ASC.getCode();
                    break;
                case 2:
                    orderBySeq = OrderByEnums.DESC.getCode();
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
        List<LightTask> list = list(wrapper);

        Page<LightTaskDto> page = new Page<>();
@@ -359,10 +433,23 @@
        return page;
    }


    // 每个路灯发送控制帧 返回关联列表
    /**
     * 用于任务新增,下发
     *
     * @param lightTask
     * @param poleIdList
     * @param framePayload
     * @param lightAddress
     * @return
     */
    private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload, String lightAddress) {
        List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
        //成功
        List<LightTaskPoleRelation> success = new ArrayList<>();
        //失败
        List<LightTaskPoleRelation> fail = new ArrayList<>();

        Map map = new HashMap();

        List<Pole> poles = poleService.listByIds(poleIdList);
        if (CollectionUtil.isEmpty(poles)) {
@@ -390,6 +477,56 @@
        return lightTaskPoleRelationList;
    }

    /**
     * 用于任务编辑
     *
     * @param poleIdList
     * @param framePayload
     * @param lightAddress
     * @return
     */
    private Map<String, List<LightTaskPoleRelation>> sendControllerFrame(List<Long> poleIdList, String framePayload, String lightAddress) {
        List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
        //成功
        List<LightTaskPoleRelation> success = new ArrayList<>();
        //失败
        List<LightTaskPoleRelation> fail = new ArrayList<>();

        Map<String, List<LightTaskPoleRelation>> map = new HashMap();

        List<Pole> poles = poleService.listByIds(poleIdList);
        if (CollectionUtil.isEmpty(poles)) {
            return null;
        }

        for (Pole pole : poles) {
            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());
                    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);
        }
        map.put("success", success);
        map.put("fail", fail);
        map.put("all", lightTaskPoleRelationList);
        return map;
    }


    @Transactional(rollbackFor = Exception.class)
    public boolean delLightTask(List<Long> taskIdList) {
        List<LightTask> lightTaskList = listByIds(taskIdList);
@@ -413,11 +550,9 @@
//            throw new BusinessException("未找到任务/灯杆绑定关系");
//        }
//        lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
        taskIdList.forEach(
                taskId -> {
                    lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
                }
        );
        taskIdList.forEach(taskId -> {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
        });

        /**
         * 删除控灯任务日志记录开始
@@ -509,10 +644,7 @@
        if (CollectionUtil.isNotEmpty(list)) {
            poleCodeList = list.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
        }
        String content = "{任务ID：" + lightTask.getTaskId()
                + "， 任务名：" + lightTask.getTaskName()
                + "}," + " 灯杆ID：" + param.getPoleId()
                + " }";
        String content = "{任务ID：" + lightTask.getTaskId() + "， 任务名：" + lightTask.getTaskName() + "}," + " 灯杆ID：" + param.getPoleId() + " }";
        StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "下发路灯任务", content);
        /**
         * 下发路灯任务日志记录结束
@@ -520,9 +652,7 @@


        if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
            return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0),
                    Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId())
                            .eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
            return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
        }


@@ -530,20 +660,40 @@
    }


    //计算功率及能耗
    public void test() {
    /**
     * 计算功率及能耗
     */
    public void energy() {
        List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
        for (LightTask lightTask : lightTasks) {
            List<LightTaskPoleRelation> list = SpringContextHolder.getBean(LightTaskPoleRelationService.class)
                    .list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
            List<LightTaskPoleRelation> list = SpringContextHolder.getBean(LightTaskPoleRelationService.class).list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));

            LightTaskDto lightTaskDto = new LightTaskDto();
            BeanUtils.copyProperties(lightTask, lightTaskDto);
            lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));

            BigDecimal decimal = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
            BigDecimal energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
            BigDecimal energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);

            //获取昨天的星期数
            LocalDateTime now = LocalDateTime.now();
            LocalDateTime yesterday = now.minusDays(1);


            LightEnergyData lightEnergyData = new LightEnergyData();
            lightEnergyData.setTaskId(lightTask.getTaskId());
            lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
            lightEnergyData.setEnergySaving(energySaving);
            lightEnergyData.setEnergy(energy);
            lightEnergyData.setUserId(lightTask.getUserId());
            lightEnergyData.setClientId(lightTask.getClientId());

            //保存能耗数据到数据库
            lightEnergyDataService.save(lightEnergyData);

            System.out.println(lightEnergyData + "---------------");
            //ID   任务id
        }
    }

}