From 74ac7af1acc588fee71d3d982c633dd841ead6e3 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 16:08:30 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 49 -------------------------------------------------
1 files changed, 0 insertions(+), 49 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 ba24393..c97437b 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
@@ -141,14 +141,7 @@
throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
+ "鐏潌id涓簕" + poleIds + "}");
}
-// //璁板綍杩欎簺鐏潌鍘熷厛鐨刬d
-// List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).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());
- //鏂板涓嶅瓨鍦ㄥ叧鐏搷浣�
List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
@@ -158,29 +151,7 @@
}
-// List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
-// List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
-// if (!oldPoleIdList.isEmpty()) {
-// //瑕嗙洊鎿嶄綔鐏潌
-// Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
-// oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
-// oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
-// }
-// //瑕嗙洊鎴愬姛 娣诲姞鏂扮殑浠诲姟鍏崇郴
-// if (!oldPoleSuccess.isEmpty()) {
-// oldPoleSuccess.forEach(success -> {
-// success.setTaskId(newLightTask.getTaskId());
-// });
-// }
- //鍒ゆ柇鏃х伅鏉嗚鐩栨搷浣滄槸鍚﹀瓨鍦ㄥけ璐� 濡傛灉瀛樺湪澶辫触锛屽垯淇濆瓨鏃х殑浠诲姟鍏崇郴
-// List<LightTaskPoleRelation> failOldLightTaskStatusAndPoles = new ArrayList<>();
-// if (!oldPoleFail.isEmpty()) {
-// //鑾峰彇澶辫触鐨勭伅鏉唅d
-// List<Long> failPoleIdList = oldPoleFail.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
-// //浠巓ldLightTaskStatusAndPoles鑾峰彇澶辫触鐨勭伅鏉嗗師鍏堢殑浠诲姟缁戝畾鍏崇郴.
-// failOldLightTaskStatusAndPoles = oldLightTaskStatusAndPoles.stream().filter(lightTaskPoleRelation -> failPoleIdList.contains(lightTaskPoleRelation.getPoleId())).collect(Collectors.toList());
-// }
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
@@ -196,18 +167,6 @@
all.addAll(newPoleMap);
int num = (int) newPoleMap.stream().filter(lightTaskPoleRelation -> lightTaskPoleRelation.getIssueStatus() != 0).count();
-// all.addAll(oldPoleSuccess)
- //鏃х伅鏉嗕笅鍙戝け璐ヤ笉闇�瑕佷繚瀛樹俊绠＄郴
-
-// //鍒犻櫎鏃х伅鏉嗕腑瑕嗙洊鎴愬姛鐨勪换鍔d
-// List<Long> oldSuccessPoleId = new ArrayList<>();
-// for (LightTaskPoleRelation bean : oldPoleSuccess) {
-// oldSuccessPoleId.add(bean.getPoleId());
-// }
-//// if (!oldSuccessPoleId.isEmpty()) {
-//// lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId).eq(LightTaskPoleRelation::getLightAddress, "0001"));
-//// lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldSuccessPoleId).eq(LightTaskPoleRelation::getLightAddress, "0002"));
-//// }
//淇濆瓨鏂扮伅鏉嗕互鍙婃棫鐏潌瑕嗙洊鎴愬姛鐨勪换鍔″叧绯�
if (!all.isEmpty()) {
@@ -321,14 +280,6 @@
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<>();
--
Gitblit v1.9.3