From b34d941094d11e21e21a2ceead8a9fdeee640e2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 11:20:55 +0800
Subject: [PATCH] 列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 110 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 35 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 03b04c3..0637e82 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
@@ -137,7 +137,7 @@
}
@Transactional(rollbackFor = Exception.class)
- public int updateLightTask(Long taskId, LightTaskParam param) {
+ public String updateLightTask(Long taskId, LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
@@ -184,6 +184,7 @@
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
+ List<LightTaskPoleRelation> newPoleFail = new ArrayList<>();
if (CollectionUtil.isNotEmpty(newPoleIdList)) {
//鏂扮伅鏉嗕笅鍙戞柊浠诲姟
Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
@@ -191,6 +192,7 @@
//newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
newPoleSuccess = newPoleMap.getOrDefault("success", new ArrayList<>());
+ newPoleFail = newPoleMap.getOrDefault("fail", new ArrayList<>());
}
List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
@@ -203,22 +205,26 @@
}
List<LightTaskPoleRelation> closePoleFail = new ArrayList<>();
- List<LightTaskPoleRelation> closeSuccess = new ArrayList<>();
+ List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
if (CollectionUtil.isNotEmpty(closeLight)) {
//鎵ц鍏崇伅鍐呭抚
String framePayloadClose = "7f0000007f173b00";
//瑕嗙洊鎿嶄綔鐏潌
Map<String, List<LightTaskPoleRelation>> closePoleMap = sendControllerFrame(closeLight, framePayloadClose, param.getLightAddress());
closePoleFail = closePoleMap.getOrDefault("fail", new ArrayList<>());
- closeSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
+ closePoleSuccess = closePoleMap.getOrDefault("success", new ArrayList<>());
}
- //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕�
+
if (closePoleFail.size() == 0 && oldPoleFail.size() == 0) {
+ //鏃т换鍔′腑鍏ㄩ儴鍙戦�佹寚浠ゆ垚鍔燂紝鏇存柊鍘熸湰浠诲姟涓殑鏁版嵁
newLightTask.setTaskId(lightTask.getTaskId());
updateById(newLightTask);
} else {
- save(newLightTask);
+ if (!newPoleSuccess.isEmpty() || !oldPoleSuccess.isEmpty()) {
+ //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕欙紝鏂板鏂扮殑浠诲姟鏁版嵁杩涜淇濆瓨
+ save(newLightTask);
+ }
}
/**
@@ -231,18 +237,13 @@
poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
}
}
- String content = "{浠诲姟ID锛�" + newLightTask.getTaskId()
- + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
- + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload()
- + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
- + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
- + " }";
+ String content = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload() + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString() + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress() + " }";
StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
/**
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- for (LightTaskPoleRelation bean : newPoleAll) {
+ for (LightTaskPoleRelation bean : newPoleSuccess) {
bean.setTaskId(newLightTask.getTaskId());
}
//鎴愬姛鐢ㄦ柊鐨勪换鍔D
@@ -260,46 +261,85 @@
}
List<LightTaskPoleRelation> all = new ArrayList<>();
- all.addAll(newPoleAll);
+ all.addAll(newPoleSuccess);
all.addAll(oldPoleSuccess);
all.addAll(oldPoleFail);
all.addAll(closePoleFail);
-
-
-
List<Long> allPoleId = new ArrayList<>();
- allPoleId.addAll(poleIdList);
- allPoleId.addAll(oldList);
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
- lightTaskPoleRelationService.saveBatch(all);
+ for (LightTaskPoleRelation bean : newPoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : oldPoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : oldPoleFail) {
+ allPoleId.add(bean.getPoleId());
+ }
+ for (LightTaskPoleRelation bean : closePoleSuccess) {
+ allPoleId.add(bean.getPoleId());
+ }
+
+ if (!allPoleId.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
+
+ }
+ if (!all.isEmpty()) {
+ lightTaskPoleRelationService.saveBatch(all);
+ }
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
- String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId()
- + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
- + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
- + " }";
+ String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId() + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName() + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString() + " }";
StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- if(oldPoleFail.isEmpty()&&closePoleFail.isEmpty()){
- //鍏ㄩ儴鎴愬姛
- return 0;
- }else if(!closeLight.isEmpty()||!oldPoleFail.isEmpty()){
- //鍏崇伅澶辫触 鎴栬�呰鐩栦换鍔″け璐�
- return 1;
- }else if(newPoleSuccess.isEmpty()&&oldPoleSuccess.isEmpty()&&closeSuccess.isEmpty()){
- //缂栬緫鍏ㄩ儴澶辫触
- return 2;
+// if (oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
+// //鍏ㄩ儴鎴愬姛
+// return 0;
+// } else if (!closeLight.isEmpty() || !oldPoleFail.isEmpty()) {
+// //鍏崇伅澶辫触 鎴栬�呰鐩栦换鍔″け璐�
+// return 1;
+// } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closeSuccess.isEmpty()) {
+// //缂栬緫鍏ㄩ儴澶辫触
+// return 2;
+// } else {
+// //鍏朵粬鎯呭喌
+// return -1;
+// }
+
+// if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
+// //缂栬緫鎴愬姛
+// return 0;
+// } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
+// //缂栬緫澶辫触
+// return 1;
+// } else {
+// //鍦ㄦ棫浠诲姟鍩虹涓婄紪杈�
+// if (lightTask.getTaskId().equals(newLightTask.getTaskId())) {
+// //鍙湁鏃т换鍔�
+// return 2;
+// } else {
+// //鏈夋柊浠诲姟锛屾湁鏃т换鍔�
+// return 3;
+// }
+// }
+
+ if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
+ return "缂栬緫鎴愬姛";
+ } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
+ throw new BusinessException("缂栬緫澶辫触");
+ } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
+ return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
+ } else if (!newPoleFail.isEmpty()) {
+ return "鏂颁换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽拷鐣ュ紓甯告搷浣滅殑鐏潌";
}else {
- //鍏朵粬鎯呭喌
- return -1;
+ return "鎿嶄綔寮傚父";
}
}
--
Gitblit v1.9.3