changes

liuhaonan

2022-08-16 228e82c427038b4788120c432afbde52becea424

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

@@ -126,7 +126,8 @@
                    .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0002"));
            oldLightTaskStatusAndPoles.addAll(list);
        } else {
            oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
            oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
                    .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
        }

        /**
@@ -235,7 +236,7 @@
        //取出覆盖操作的关系信息
        //记录这些灯杆原先的任务
        List<LightTaskPoleRelation> oldRelation = new ArrayList<>();
        if ("FFFF".equals(param.getLightAddress())) {
        if ("FFFF".equals(param.getLightAddress())) {  //todo
            // 灯杆中存在其他任务的灯头
            if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
                oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
@@ -247,7 +248,7 @@
        } else {
            if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
                oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
                        .eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
                        .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
            }
        }