fix

zhanzhiqin

2022-05-20 562c82e54b9fc9ac9a640f07b9d03355226ae3f4

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

@@ -226,16 +226,21 @@
            );
            //修改灯杆任务绑定关系表
            for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
                LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));

                //成功才修改，失败不变
                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);
                    }
                } else {
                    if (one == null) {
                        lightTaskPoleRelationService.save(bean);
                    }

                }
            }

@@ -533,7 +538,9 @@
    }


    //计算功率及能耗
    /**
     * 计算功率及能耗
     */
    public void energy() {
        List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
        for (LightTask lightTask : lightTasks) {
@@ -560,6 +567,9 @@
            lightEnergyData.setUserId(lightTask.getUserId());
            lightEnergyData.setClientId(lightTask.getClientId());

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

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