fix

zhanzhiqin

2022-05-20 51eb63d31f771dd71b34d22e23c94ab2ee27f5c4

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

@@ -29,6 +29,7 @@
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.admin.vo.ControlLightCommandVO;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
@@ -41,6 +42,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -61,6 +63,7 @@
    private final PoleService poleService;
    private final LightTaskPoleRelationService lightTaskPoleRelationService;
    private final LightTaskMapper lightTaskMapper;
    private final ClientService clientService;

    /**
     * 新增路灯任务
@@ -75,7 +78,10 @@
            week |= w;
        }
        LightTask lightTask = new LightTask();
        lightTask.setClientId(SecurityUtils.getClientId());
        if (SecurityUtils.getClientId() != null) {
            lightTask.setClientId(clientService.getClientId());
            lightTask.setUserId(SecurityUtils.getUserId());
        }
        lightTask.setTaskName(param.getTaskName());
        lightTask.setWeek(week);
        lightTask.setLightAdress(param.getLightAddress());
@@ -148,20 +154,33 @@
        if (lightTask == null) {
            throw new BusinessException("找不到路灯任务");
        }


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


        int week = 0;
        for (Integer w : param.getWeekList()) {
            week |= w;
        }
        lightTask.setTaskName(param.getTaskName());
        lightTask.setWeek(week);
        lightTask.setControlOrder(param.getControlOrder());
        lightTask.setOpenOrder(param.getOpenOrder());
        lightTask.setCloseOrder(param.getCloseOrder());
        lightTask.setLightAdress(param.getLightAddress());
        lightTask.setUpdateTime(LocalDateTime.now());
        lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));

        if (!updateById(lightTask)) {
        LightTask newLightTask = new LightTask();
        newLightTask.setTaskName(param.getTaskName());
        if (SecurityUtils.getClientId() != null) {
            lightTask.setClientId(clientService.getClientId());
            lightTask.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("编辑任务失败");
        }

@@ -175,9 +194,9 @@
                poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
            }
        }
        String content = "{任务ID：" + taskId
                + "， 任务名：" + lightTask.getTaskName()
                + "}，{内帧指令" + lightTask.getFramePayload()
        String content = "{任务ID：" + newLightTask.getTaskId()
                + "， 任务名：" + newLightTask.getTaskName()
                + "}，{内帧指令" + newLightTask.getFramePayload()
                + "， 灯杆ID：" + param.getPoleIdList().toString()
                + "， 控制的灯头地址：" + param.getLightAddress()
                + " }";
@@ -188,17 +207,79 @@

        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) {

            List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());

            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
            // 添加绑定灯杆
            if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
                throw new BusinessException("绑定灯杆失败");
                    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);
                    }
                }
            }

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

            /**
             * 下发路灯任务日志记录开始
@@ -315,6 +396,11 @@
        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("删除任务失败，删除的任务有灯杆正在使用");
        }

        // 删除任务
@@ -443,4 +529,15 @@

        return true;
    }


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


        SpringContextHolder.getBean(LightService.class).jisuan(new LightTaskDto());

    }
}