From ab2504a3f8374755bb11f50f84ca41150dce42d1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 23 五月 2022 19:00:54 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 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 ca03876..0365d59 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("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
@@ -215,12 +215,16 @@
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);
+ }
}
/**
@@ -239,7 +243,7 @@
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- for (LightTaskPoleRelation bean : newPoleAll) {
+ for (LightTaskPoleRelation bean : newPoleSuccess) {
bean.setTaskId(newLightTask.getTaskId());
}
//鎴愬姛鐢ㄦ柊鐨勪换鍔D
@@ -257,20 +261,33 @@
}
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);
+ }
/**
@@ -300,21 +317,30 @@
// //缂栬緫鎴愬姛
// return 0;
// } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
-// //缂栬緫澶辫触, 鏂版棫浠诲姟閮芥湁
+// //缂栬緫澶辫触
// return 1;
-// } else if ((newPoleSuccess.isEmpty() && newPoleFail.isEmpty())) {
-// if (oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
-// //缂栬緫澶辫触,淇濈暀鍘熷厛浠诲姟娌℃湁鏀瑰彉,鍙湁鏃т换鍔�
+// } else {
+// //鍦ㄦ棫浠诲姟鍩虹涓婄紪杈�
+// if (lightTask.getTaskId().equals(newLightTask.getTaskId())) {
+// //鍙湁鏃т换鍔�
// return 2;
-// } else {
-// //缂栬緫閮ㄥ垎鎴愬姛閮ㄥ垎澶辫触,鏂版棫浠诲姟鍚屾椂瀛樺湪
+// } else {
+// //鏈夋柊浠诲姟锛屾湁鏃т换鍔�
// return 3;
// }
-// } else {
-// return -1;
// }
- return 0;
+ if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) {
+ return "缂栬緫鎴愬姛";
+ } else if (!closePoleFail.isEmpty() || !oldPoleFail.isEmpty()) {
+ return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
+ } else if (!newPoleFail.isEmpty()) {
+ return "鏂颁换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽拷鐣ュ紓甯告搷浣滅殑鐏潌";
+ } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
+ throw new BusinessException("缂栬緫澶辫触");
+ } else {
+ return "鎿嶄綔寮傚父";
+ }
}
--
Gitblit v1.9.3