From e8b8b4d115a3bb5d7234586e397587dfa30f86a4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 15 八月 2022 15:04:06 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 84 ++++++++++++++---------------------------
1 files changed, 29 insertions(+), 55 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..0571c99 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,6 @@
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 +150,6 @@
}
-// 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 +165,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()) {
@@ -308,6 +265,9 @@
}
+
+
+
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
@@ -321,21 +281,23 @@
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> 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<>();
- if (CollectionUtil.isNotEmpty(closeLight)) {
+ System.out.println(closeLight + "closeLight");
+ if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null&& closeLight.get(0) != null) {
//鍏崇伅鍐呭抚
String framePayloadClose = "7f0000007f173b00";
- //瑕嗙洊鎿嶄綔鐏潌
+ //鍏崇伅鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
@@ -372,6 +334,14 @@
for (LightTaskPoleRelation bean : newPoleSuccess) {
bean.setTaskId(newLightTask.getTaskId());
}
+ //鎴愬姛鐢ㄦ柊鐨勪换鍔D
+ for (LightTaskPoleRelation bean : oldPoleSuccess) {
+ bean.setTaskId(newLightTask.getTaskId());
+ }
+ //澶辫触鐢ㄦ棫鐨勪换鍔D
+ for (LightTaskPoleRelation bean : oldPoleFail) {
+ bean.setTaskId(lightTask.getTaskId());
+ }
//澶辫触鐢ㄦ棫鐨勪换鍔D
for (LightTaskPoleRelation bean : closePoleFail) {
@@ -380,6 +350,7 @@
List<LightTaskPoleRelation> all = new ArrayList<>();
all.addAll(newPoleSuccess);
+ all.addAll(oldPoleFail);
// all.addAll(closePoleFail);
@@ -388,6 +359,9 @@
allPoleId.add(bean.getPoleId());
}
for (LightTaskPoleRelation bean : closePoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : oldPoleSuccess) {
allPoleId.add(bean.getPoleId());
}
@@ -563,7 +537,7 @@
for (Pole pole : poles) {
if (pole.getDeviceCode() == null || pole.getDeviceCode().equals("")) {
removeById(lightTask.getTaskId());
- throw new BusinessException("鐏潌涓嶅瓨鍦╩ac,涓嶈兘涓嬪彂浠诲姟 璇锋鏌ョ伅鏉嗘槸鍚﹀瓨鍦ㄥ崟鐏�");
+ throw new BusinessException("缂栬緫鐨勭伅鏉嗘垨鍘熸湁浠诲姟鐨勭伅鏉嗕笉瀛樺湪mac,涓嶈兘涓嬪彂浠诲姟 璇锋鏌ョ伅鏉嗘槸鍚﹀瓨鍦ㄥ崟鐏�");
}
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
@@ -654,7 +628,7 @@
for (Pole pole : poles) {
if (pole.getDeviceCode() == null || pole.getDeviceCode().equals("")) {
- throw new BusinessException("鐏潌涓嶅瓨鍦╩ac,涓嶈兘涓嬪彂浠诲姟 璇锋鏌ョ伅鏉嗘槸鍚﹀瓨鍦ㄥ崟鐏�");
+ throw new BusinessException("缂栬緫鐨勭伅鏉嗘垨鍘熸湁浠诲姟鐨勭伅鏉嗕笉瀛樺湪mac,涓嶈兘涓嬪彂浠诲姟 璇锋鏌ョ伅鏉嗘槸鍚﹀瓨鍦ㄥ崟鐏�");
}
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
--
Gitblit v1.9.3