From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 74 ++++++++++++++++++++++++++----------
1 files changed, 53 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 324735b..7ca83bb 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
@@ -83,7 +83,6 @@
if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
}
-// LightTask lightTask = getById(null);
int week = 0;
@@ -144,12 +143,6 @@
newPoleMap.forEach(
commend -> {
//寮�鍏崇伅鏃堕棿
-// String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
-// if (newLightTask.getControlOrder() != null) {
-// //鎺х伅鏃堕棿
-// s = s + newLightTask.getControlOrder();
-// }
-// // 鏇存柊绯荤粺瀹氭椂
commend.setSysScheduled(JSON.toJSONString(newLightTask));
System.out.println(commend.getIssueStatus() + "鐘舵��");
if (commend.getIssueStatus() == 0) {
@@ -213,6 +206,9 @@
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
+ if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
+ throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
+ }
LightTask newLightTask = getById(taskId);
if (newLightTask == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
@@ -224,7 +220,6 @@
week |= w;
}
-// LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
@@ -340,8 +335,29 @@
all.addAll(newPoleFail);
all.addAll(oldPoleSuccess);
all.addAll(oldPoleFail);
- all.addAll(closePoleSuccess);
- all.addAll(closePoleFail);
+
+
+ if (closePoleFail.size() != 0) {
+ List<LightTaskPoleRelation> colesFail = new ArrayList<>();
+ //鍘熸潵浠诲姟涓湰韬氨涓嬪彂澶辫触鐨勪换鍔� 鍗崇‖浠跺畾鏃朵负绌� 缂栬緫鍚庤繘琛屽叧鐏搷浣� 鍙洿鎺ュ墧闄や换鍔″叧绯�
+ closePoleFail.forEach(
+ close -> {
+ relations.forEach(
+ task -> {
+ System.out.println(task.getLightAddress().equals(close.getLightAddress()) + " addressResult");
+ System.out.println(close.getLightAddress() + " close.getLightAddress()");
+ if (task.getLightAddress().equals(close.getLightAddress()) && task.getDeviceCode().equals(close.getDeviceCode())
+ && task.getDeviceScheduled() != null && !task.getDeviceScheduled().isEmpty()) {
+ colesFail.add(close);
+ }
+ }
+ );
+ all.addAll(colesFail);
+ }
+ );
+
+ }
+
if (!all.isEmpty()) {
List<LightTaskPoleRelation> finalOldRelation = relations;
@@ -359,6 +375,7 @@
//涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
}
+
}
});
@@ -369,19 +386,14 @@
//缂栬緫鍓嶅悗鎵�鏈夌殑鐏潌ID闆嗗悎
poleIdList.addAll(oldList);
- List<Long> longs = new ArrayList<>();
//鍘婚噸
List<Long> collect = poleIdList.stream().distinct().collect(Collectors.toList());
-// for (Long item : poleIdList) {
-// if (!poleIdList.contains(item)) {
-// longs.add(item);
-// }
-// }
if (!collect.isEmpty()) {
lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
.in(LightTaskPoleRelation::getPoleId, collect).eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()));
}
+
if (!all.isEmpty()) {
b = lightTaskPoleRelationService.saveBatch(all);
@@ -715,6 +727,10 @@
lightTaskRelationVO.setLightAddress(relation.getLightAddress());
lightTaskRelationVO.setIssueStatus(relation.getIssueStatus());
lightTaskRelationVO.setPoleId(relation.getPoleId());
+ Pole byId = poleService.getById(relation.getPoleId());
+ if (byId != null) {
+ lightTaskRelationVO.setPoleName(byId.getPoleName());
+ }
LightTaskVO sys = JSONObject.parseObject(relation.getSysScheduled(), LightTaskVO.class);
sys.setWeekList(TaskOrderUtil.parseLightWeek2List(sys.getWeek()));
@@ -790,11 +806,21 @@
* 涓嬪彂鍗曚釜鐏潌鐨勪换鍔�
*/
public boolean issueLightTask(LightTaskIssueParam param) {
- LightTask lightTask = getById(param.getTaskId());
+
+ LightTaskPoleRelation relation = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+
+ if (relation == null) {
+ throw new BusinessException("鎵句笉鍒颁换鍔″叧绯�,鏃犳硶琛ュ彂");
+ }
+ LightTask lightTask = JSONObject.parseObject(relation.getSysScheduled(), LightTask.class);
+// LightTask lightTask = getById(param.getTaskId());
if (lightTask == null) {
throw new BusinessException("鎵句笉鍒颁换鍔�");
}
+ //杞崲甯ф寚浠�
String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
+ //鍙戦�乺rpc 寰楀埌鍙戦�佺粨鏋�
List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());
/**
@@ -813,11 +839,17 @@
if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
- return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0), Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId()).eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
+ LightTaskPoleRelation lightTaskPoleRelation = lightTaskPoleRelationList.get(0);
+ if (lightTaskPoleRelation.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊纭欢瀹氭椂 杩斿洖鎴愬姛
+ relation.setDeviceScheduled(JSON.toJSONString(lightTaskPoleRelation));
+ lightTaskPoleRelationService.updateById(relation);
+ return true;
+ } else {
+ return false;
+ }
}
-
-
- return true;
+ return false;
}
--
Gitblit v1.9.3