From 228e82c427038b4788120c432afbde52becea424 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 16 八月 2022 09:48:46 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 637c9c4..4dc277b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/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()));
}
}
--
Gitblit v1.9.3