From d938c951a1669b4df877ffc6521aef17f0fac809 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 28 十月 2022 17:53:05 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 7ca83bb..c528e04 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
@@ -284,10 +284,12 @@
//鏂扮伅鏉嗕笅鍙戞柊浠诲姟
Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
- //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
- newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
- newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
- newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
+ if (newPoleMap != null) {
+ //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
+ newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
+ newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
+ newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
+ }
}
List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
@@ -295,8 +297,10 @@
if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
//瑕嗙洊鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, newLightTask.getFramePayload(), param.getLightAddress());
- oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
- oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
+ if (oldPoleMap != null) {
+ oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
+ oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
+ }
}
@@ -308,8 +312,10 @@
String framePayloadClose = "";
//鍏崇伅鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
- closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
- closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
+ if (closePoleMap != null) {
+ closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
+ closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
+ }
}
@@ -664,6 +670,10 @@
//瀛樺湪浠诲姟鍏崇郴 涓嬪彂娓呴櫎浠诲姟鎸囦护
Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());
+ if (ffff == null) {
+ throw new BusinessException("鍒犻櫎澶辫触");
+ }
+
/**
* 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
--
Gitblit v1.9.3