From 75173289ebdf9d710d6c89c3cff82e4b5aac99f2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 22 九月 2022 16:52:41 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 535 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 291 insertions(+), 244 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 7ffe4e2..2d2a307 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
@@ -74,9 +74,13 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public String newAddLightTask(LightTaskParam param) {
+ public String AddLightTask(LightTaskParam param) {
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 lightTask = getById(null);
@@ -113,6 +117,7 @@
poleIdList.add(item);
}
}
+
if (CollectionUtil.isNotEmpty(poleIdList)) {
List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(poleIdList);
if (CollectionUtil.isNotEmpty(poleList)) {
@@ -124,30 +129,8 @@
//璁板綍杩欎簺鐏潌鍘熷厛鐨勪换鍔�
- List<LightTaskPoleRelation> oldLightTaskStatusAndPoles;
- if ("FFFF".equals(param.getLightAddress())) {
- oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0001"));
- List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, "0002"));
- oldLightTaskStatusAndPoles.addAll(list);
- } else {
- oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
- .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
- }
-
- /**
- * 閲嶅浠诲姟鐨勭伅澶�
- */
- List<Long> taskIds = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
- List<Long> poleIds = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
- //poleIds涓噸澶嶅厓绱犲彧淇濈暀涓�涓�
- taskIds = taskIds.stream().distinct().collect(Collectors.toList());
- poleIds = poleIds.stream().distinct().collect(Collectors.toList());
- if (!oldLightTaskStatusAndPoles.isEmpty()) {
- throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
- + "鐏潌id涓簕" + poleIds + "}");
- }
+ List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
List<LightTaskPoleRelation> newPoleMap = new ArrayList<>();
@@ -156,6 +139,33 @@
newPoleMap = sendControllerFrame(newLightTask, poleIdList, newLightTask.getFramePayload(), param.getLightAddress());
}
+
+ newPoleMap.forEach(
+ commend -> {
+ //寮�鍏崇伅鏃堕棿
+ String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
+ if (newLightTask.getControlOrder() != null) {
+ //鎺х伅鏃堕棿
+ s = s + newLightTask.getControlOrder();
+ }
+ // 鏇存柊绯荤粺瀹氭椂
+ commend.setSysScheduled(s);
+ if (commend.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
+ commend.setDeviceScheduled(s);
+ } else {
+ //涓嬪彂澶辫触 鏇存柊绯荤粺瀹氭椂 淇濈暀纭欢瀹氭椂 纭欢瀹氭椂
+// commend.setSysScheduled(s);
+ oldLightTaskStatusAndPoles.forEach(task -> {
+ if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
+ //鍚屼竴涓伅澶�
+ commend.setDeviceScheduled(task.getDeviceScheduled());
+ }
+ });
+
+ }
+ }
+ );
/**
@@ -168,35 +178,41 @@
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- List<LightTaskPoleRelation> all = new ArrayList<>();
- all.addAll(newPoleMap);
- int num = (int) newPoleMap.stream().filter(lightTaskPoleRelation -> lightTaskPoleRelation.getIssueStatus() != 0).count();
+ //鍒犻櫎鏃х殑鍏崇郴
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getLightAddress, newLightTask.getLightAdress()).in(LightTaskPoleRelation::getPoleId, poleIdList));
- //淇濆瓨鏂扮伅鏉嗕互鍙婃棫鐏潌瑕嗙洊鎴愬姛鐨勪换鍔″叧绯�
- if (!all.isEmpty()) {
- lightTaskPoleRelationService.saveBatch(all);
+ boolean b = true;
+ //淇濆瓨浠诲姟鍏崇郴
+ if (!newPoleMap.isEmpty()) {
+ b = lightTaskPoleRelationService.saveBatch(newPoleMap);
}
- if (!poleIdList.isEmpty() && num == newPoleMap.size()) {
+ if (!b) {
//鎵�鏈夌伅鏉嗛兘涓嬪彂澶辫触 鏂板鐨勪换鍔′笉淇濈暀
removeById(newLightTask);
throw new BusinessException("鎸囦护涓嬪彂澶辫触,璇锋鏌ョ伅鏉嗙姸鎬佸悗閲嶆柊鏂板浠诲姟");
} else {
return "浠诲姟鏂板鎴愬姛";
}
-
-
}
+ /**
+ * 缂栬緫璺伅浠诲姟
+ *
+ * @param taskId
+ * @param param
+ * @return
+ */
@Transactional(rollbackFor = Exception.class)
- public String updateLightTask(Long taskId, LightTaskParam param) {
+ public String newUpdateLightTask(Long taskId, LightTaskParam param) {
if (StrUtil.length(param.getControlOrder()) % LightTaskParam.REQUEST_ORDER_LENGTH != 0) {
throw new BusinessException("鐏帶鍛戒护鏍煎紡涓嶆纭�");
}
- LightTask lightTask = getById(taskId);
- if (lightTask == null) {
+ LightTask newLightTask = getById(taskId);
+ if (newLightTask == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
}
@@ -206,7 +222,7 @@
week |= w;
}
- LightTask newLightTask = new LightTask();
+// LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
newLightTask.setClientId(clientService.getClientId());
@@ -221,6 +237,7 @@
newLightTask.setUpdateTime(LocalDateTime.now());
newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
+ updateById(newLightTask);
//缂栬緫鍚庣伅鏉咺D闆嗗悎
List<Long> poleIdList = new ArrayList<>();
@@ -230,17 +247,17 @@
poleIdList.add(item);
}
}
- if (poleIdList.isEmpty()) {
- throw new BusinessException("缂栬緫浠诲姟鏃惰閫夋嫨鐏潌");
- }
//璁板綍浠诲姟缂栬緫鍣ㄥ墠鐏潌ID闆嗗悎
- List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
- List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskStatusAndPole::getId).collect(Collectors.toList());
+// List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
+ List<LightTaskPoleRelation> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
+ List<Long> oldList = oldLightTaskStatusAndPoles.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
//鍒ゆ柇poleIdList涓槸鍚︽湁鏃х殑鐏潌ID (鐩存帴涓嬪彂)
List<Long> newPoleIdList = poleIdList.stream().filter(poleId -> !oldList.contains(poleId)).collect(Collectors.toList());
//鍒ゆ柇poleIdList涓槸鍚︽湁鏂扮殑鐏潌ID (瑕嗙洊鎿嶄綔)
List<Long> oldPoleIdList = poleIdList.stream().filter(poleId -> oldList.contains(poleId)).collect(Collectors.toList());
+
+
//oldList涓湁鐨勭伅鏉咺D锛屼絾鏄痯oleIdList涓病鏈� (鍏崇伅鎿嶄綔)
List<Long> closeLight = oldList.stream().filter(poleId -> !poleIdList.contains(poleId)).collect(Collectors.toList());
@@ -248,35 +265,20 @@
//鍙栧嚭瑕嗙洊鎿嶄綔鐨勫叧绯讳俊鎭�
//璁板綍杩欎簺鐏潌鍘熷厛鐨勪换鍔�
List<LightTaskPoleRelation> oldRelation = new ArrayList<>();
- if ("FFFF".equals(param.getLightAddress())) {
- // 鐏潌涓瓨鍦ㄥ叾浠栦换鍔＄殑鐏ご
- if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
- oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
- .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, "0001"));
- List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
- .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, "0002"));
- oldRelation.addAll(list);
- }
- } else {
- if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
- oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldPoleIdList)
- .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
- }
+
+ if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
+ List<Long> oldRelationList = new ArrayList<>();
+ oldRelationList.addAll(oldPoleIdList);
+ oldRelationList.addAll(closeLight);
+ oldRelation = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, oldRelationList)
+ .ne(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
}
- /**
- * 閲嶅浠诲姟鐨勭伅澶�
- */
- if (!oldRelation.isEmpty()) {
- List<Long> taskIds = oldRelation.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
- List<Long> poleIds = oldRelation.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
- //poleIds涓噸澶嶅厓绱犲彧淇濈暀涓�涓�
- taskIds = taskIds.stream().distinct().collect(Collectors.toList());
- poleIds = poleIds.stream().distinct().collect(Collectors.toList());
- throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
- + "鐏潌id涓簕" + poleIds + "}");
- }
+ //鍙栧嚭浠诲姟涓師鏈夌殑浠诲姟淇℃伅
+ List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getTaskId, taskId).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ relations.addAll(oldRelation);
List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
List<LightTaskPoleRelation> newPoleSuccess = new ArrayList<>();
@@ -305,25 +307,14 @@
List<LightTaskPoleRelation> closePoleSuccess = new ArrayList<>();
System.out.println(closeLight + "closeLight");
if (CollectionUtil.isNotEmpty(closeLight) && closeLight != null && closeLight.get(0) != null) {
- //鍏崇伅鍐呭抚
- String framePayloadClose = "7F0000007F173B00";
+ //娓呴櫎甯ф寚浠�
+ 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 (closePoleFail.size() == 0) {
- //鏃т换鍔′腑鍏ㄩ儴鍙戦�佹寚浠ゆ垚鍔燂紝鏇存柊鍘熸湰浠诲姟涓殑鏁版嵁
- newLightTask.setTaskId(lightTask.getTaskId());
- updateById(newLightTask);
- } else {
- if (!newPoleSuccess.isEmpty()) {
- //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕欙紝鏂板鏂扮殑浠诲姟鏁版嵁杩涜淇濆瓨
- save(newLightTask);
- }
- }
/**
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
@@ -341,48 +332,55 @@
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- 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) {
- bean.setTaskId(lightTask.getTaskId());
- }
List<LightTaskPoleRelation> all = new ArrayList<>();
all.addAll(newPoleSuccess);
+ all.addAll(newPoleFail);
all.addAll(oldPoleSuccess);
-// all.addAll(oldPoleFail);
-// all.addAll(closePoleFail);
+ all.addAll(oldPoleFail);
+ all.addAll(closePoleSuccess);
+ all.addAll(closePoleFail);
+ if (!all.isEmpty()) {
+ List<LightTaskPoleRelation> finalOldRelation = relations;
+ all.forEach(
+ commend -> {
+ commend.setTaskId(newLightTask.getTaskId());
+ //寮�鍏崇伅鏃堕棿
+ String s = newLightTask.getOpenOrder() + newLightTask.getCloseOrder();
+ if (newLightTask.getControlOrder() != null) {
+ //鎺х伅鏃堕棿
+ s = s + newLightTask.getControlOrder();
+ }
+ // 鏇存柊绯荤粺瀹氭椂
+ commend.setSysScheduled(s);
+ // 鍏堣缃‖浠跺畾鏃朵负涓婃鐨勭‖浠跺畾鏃� 涓嶈鎴愬姛澶辫触
+ String finalS = s;
+ finalOldRelation.forEach(task -> {
+ if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
+ //鍚屼竴涓伅澶�
+ commend.setDeviceScheduled(task.getDeviceScheduled());
+ if (commend.getIssueStatus() == 0) {
+ //涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
+ commend.setDeviceScheduled(finalS);
+ }
+ }
+ });
- List<Long> allPoleId = new ArrayList<>();
- for (LightTaskPoleRelation bean : newPoleSuccess) {
- allPoleId.add(bean.getPoleId());
+ }
+ );
}
- for (LightTaskPoleRelation bean : closePoleSuccess) {
- allPoleId.add(bean.getPoleId());
- }
- for (LightTaskPoleRelation bean : oldPoleSuccess) {
- allPoleId.add(bean.getPoleId());
- }
+ boolean b = true;
- if (!allPoleId.isEmpty()) {
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, allPoleId));
+ //缂栬緫鍓嶅悗鎵�鏈夌殑鐏潌ID闆嗗悎
+ poleIdList.addAll(oldList);
+ if (!poleIdList.isEmpty()) {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList));
}
if (!all.isEmpty()) {
- lightTaskPoleRelationService.saveBatch(all);
+ b = lightTaskPoleRelationService.saveBatch(all);
}
@@ -395,16 +393,10 @@
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- if (newPoleFail.isEmpty() && closePoleFail.isEmpty() && oldPoleFail.isEmpty()) {
+ if (b) {
return "缂栬緫鎴愬姛";
- } else if (newPoleSuccess.isEmpty() && closePoleSuccess.isEmpty() && oldPoleSuccess.isEmpty()) {
- throw new BusinessException("缂栬緫澶辫触,璇锋鏌ュ師鏈夎澶囧拰缂栬緫鍚庣殑璁惧鏄惁鍦ㄧ嚎!");
- } else if (!closePoleFail.isEmpty() && !newPoleSuccess.isEmpty() && !oldPoleFail.isEmpty()) {
- return "鍘熶换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽師浠诲姟淇濈暀锛屽垱寤烘柊浠诲姟杩涜淇濆瓨";
- } else if (!newPoleFail.isEmpty()) {
- return "鏂颁换鍔′腑瀛樺湪涓嬪彂寮傚父锛屽拷鐣ュ紓甯告搷浣滅殑鐏潌";
} else {
- return "鎿嶄綔寮傚父";
+ return "缂栬緫澶辫触";
}
}
@@ -554,65 +546,68 @@
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
+
// rrpc 鍙戠敓瀹氭椂鍛戒护
- if ("FFFF".equals(lightAddress)) {
- LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
- lightTaskPoleRelation01.setPoleId(pole.getId());
- lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
- lightTaskPoleRelation01.setLightAddress("0001");
-
- LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
- lightTaskPoleRelation02.setPoleId(pole.getId());
- lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
- lightTaskPoleRelation02.setLightAddress("0002");
-
- // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
- //鐏ご1
- if (a5LightTimerRespInnerFrame01 == null) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- } else {
- lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- }
-
- // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
- //鐏ご2
- if (a5LightTimerRespInnerFrame02 == null) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- } else {
- lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- }
-
- lightTaskPoleRelationList.add(lightTaskPoleRelation01);
- lightTaskPoleRelationList.add(lightTaskPoleRelation02);
- } else {
- lightTaskPoleRelation.setLightAddress(lightAddress);
- // rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
- if (a5LightTimerRespInnerFrame == null) {
- lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- } else {
- lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
- }
- } catch (BusinessException e) {
+// if ("FFFF".equals(lightAddress)) {
+// LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
+// lightTaskPoleRelation01.setPoleId(pole.getId());
+// lightTaskPoleRelation01.setTaskId(lightTask.getTaskId());
+// lightTaskPoleRelation01.setLightAddress("0001");
+//
+// LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
+// lightTaskPoleRelation02.setPoleId(pole.getId());
+// lightTaskPoleRelation02.setTaskId(lightTask.getTaskId());
+// lightTaskPoleRelation02.setLightAddress("0002");
+//
+// // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
+// try {
+// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
+// //鐏ご1
+// if (a5LightTimerRespInnerFrame01 == null) {
+// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// } else {
+// lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
+// }
+//
+// } catch (BusinessException e) {
+// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// }
+//
+// // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
+// try {
+// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
+// //鐏ご2
+// if (a5LightTimerRespInnerFrame02 == null) {
+// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// } else {
+// lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
+// }
+//
+// } catch (BusinessException e) {
+// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// }
+//
+// lightTaskPoleRelationList.add(lightTaskPoleRelation01);
+// lightTaskPoleRelationList.add(lightTaskPoleRelation02);
+// } else {
+ lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
+ lightTaskPoleRelation.setLightAddress(lightAddress);
+ // rrpc 鍙戠敓瀹氭椂鍛戒护
+ try {
+ A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
+ if (a5LightTimerRespInnerFrame == null) {
lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ } else {
+ lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
}
- lightTaskPoleRelationList.add(lightTaskPoleRelation);
+ } catch (BusinessException e) {
+ e.printStackTrace();
+ lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
}
-
+ lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
+
+// }
return lightTaskPoleRelationList;
}
@@ -651,71 +646,72 @@
// rrpc 鍙戠敓瀹氭椂鍛戒护
- if ("FFFF".equals(lightAddress)) {
- LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
- lightTaskPoleRelation01.setPoleId(pole.getId());
- lightTaskPoleRelation01.setLightAddress("0001");
-
- LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
- lightTaskPoleRelation02.setPoleId(pole.getId());
- lightTaskPoleRelation02.setLightAddress("0002");
-
- // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
- //鐏ご1
- if (a5LightTimerRespInnerFrame01 == null) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation01);
- } else {
- lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
- success.add(lightTaskPoleRelation01);
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation01);
- }
-
- // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
- //鐏ご2
- if (a5LightTimerRespInnerFrame02 == null) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation02);
- } else {
- lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
- success.add(lightTaskPoleRelation02);
- }
-
- } catch (BusinessException e) {
- lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation02);
- }
-
- lightTaskPoleRelationList.add(lightTaskPoleRelation01);
- lightTaskPoleRelationList.add(lightTaskPoleRelation02);
- } else {
- lightTaskPoleRelation.setLightAddress(lightAddress);
- // rrpc 鍙戠敓瀹氭椂鍛戒护
- try {
- A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
- if (a5LightTimerRespInnerFrame == null) {
- lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
- fail.add(lightTaskPoleRelation);
- } else {
- lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
- success.add(lightTaskPoleRelation);
- }
- } catch (BusinessException e) {
+// if ("FFFF".equals(lightAddress)) {
+// LightTaskPoleRelation lightTaskPoleRelation01 = new LightTaskPoleRelation();
+// lightTaskPoleRelation01.setPoleId(pole.getId());
+// lightTaskPoleRelation01.setLightAddress("0001");
+//
+// LightTaskPoleRelation lightTaskPoleRelation02 = new LightTaskPoleRelation();
+// lightTaskPoleRelation02.setPoleId(pole.getId());
+// lightTaskPoleRelation02.setLightAddress("0002");
+//
+// // 鐏ご1 rrpc 鍙戠敓瀹氭椂鍛戒护
+// try {
+// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame01 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0001");
+// //鐏ご1
+// if (a5LightTimerRespInnerFrame01 == null) {
+// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// fail.add(lightTaskPoleRelation01);
+// } else {
+// lightTaskPoleRelation01.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame01.getResponseStatus()));
+// success.add(lightTaskPoleRelation01);
+// }
+//
+// } catch (BusinessException e) {
+// lightTaskPoleRelation01.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// fail.add(lightTaskPoleRelation01);
+// }
+//
+// // 鐏ご2 rrpc 鍙戠敓瀹氭椂鍛戒护
+// try {
+// A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame02 = sendTimeRRpc(framePayload, pole.getDeviceCode(), "0002");
+// //鐏ご2
+// if (a5LightTimerRespInnerFrame02 == null) {
+// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// fail.add(lightTaskPoleRelation02);
+// } else {
+// lightTaskPoleRelation02.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame02.getResponseStatus()));
+// success.add(lightTaskPoleRelation02);
+// }
+//
+// } catch (BusinessException e) {
+// lightTaskPoleRelation02.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+// fail.add(lightTaskPoleRelation02);
+// }
+//
+// lightTaskPoleRelationList.add(lightTaskPoleRelation01);
+// lightTaskPoleRelationList.add(lightTaskPoleRelation02);
+// } else {
+ lightTaskPoleRelation.setLightAddress(lightAddress);
+ lightTaskPoleRelation.setDeviceCode(pole.getDeviceCode());
+ // rrpc 鍙戠敓瀹氭椂鍛戒护
+ try {
+ A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
+ if (a5LightTimerRespInnerFrame == null) {
lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
fail.add(lightTaskPoleRelation);
+ } else {
+ lightTaskPoleRelation.setIssueStatus(HexUtil.hexToInt(a5LightTimerRespInnerFrame.getResponseStatus()));
+ success.add(lightTaskPoleRelation);
}
- lightTaskPoleRelationList.add(lightTaskPoleRelation);
+ } catch (BusinessException e) {
+ lightTaskPoleRelation.setIssueStatus(DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ fail.add(lightTaskPoleRelation);
}
-
+ lightTaskPoleRelationList.add(lightTaskPoleRelation);
}
+
+// }
map.put("success", success);
map.put("fail", fail);
map.put("all", lightTaskPoleRelationList);
@@ -725,22 +721,21 @@
@Transactional(rollbackFor = Exception.class)
- public boolean delLightTask(List<Long> taskIdList) {
+ public String delLightTask(List<Long> taskIdList) {
List<LightTask> lightTaskList = listByIds(taskIdList);
if (CollectionUtil.isEmpty(lightTaskList)) {
throw new BusinessException("鎵句笉鍒颁换鍔′俊鎭�");
}
- List<LightTaskPoleRelation> list = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
- if (list.size() != 0) {
- throw new BusinessException("鍒犻櫎浠诲姟澶辫触锛屽垹闄ょ殑浠诲姟鏈夌伅鏉嗘鍦ㄤ娇鐢�");
- }
+ //鍙栧嚭浠诲姟鍏崇郴
+ List<LightTaskPoleRelation> relations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
- // 鍒犻櫎浠诲姟
- if (!removeByIds(taskIdList)) {
- throw new BusinessException("鍒犻櫎浠诲姟澶辫触");
- }
+ //鍙栧嚭鐏潌id
+ List<Long> poleIds = relations.stream().map(LightTaskPoleRelation::getPoleId).distinct().collect(Collectors.toList());
+ //涓嬪彂娓呴櫎浠诲姟鎸囦护
+// boolean b = clearLightTask(lightTaskIds);
+ Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", "FFFF");
/**
* 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
@@ -749,7 +744,30 @@
/**
* 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
- return true;
+ if (ffff.get("fail").size() == 0) {
+ //鍏ㄩ儴娓呴櫎鎴愬姛 鍒犻櫎鍏ㄩ儴浠诲姟鍏崇郴
+ lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
+ //鍒犻櫎浠诲姟
+ removeByIds(taskIdList);
+ return "浠诲姟鍒犻櫎鎴愬姛";
+ } else {
+ //閮ㄥ垎娓呴櫎鎴愬姛 鍒犻櫎鎴愬姛閮ㄥ垎鐨勪换鍔″叧绯�
+ ffff.get("success").forEach(lightTaskPoleRelation -> {
+ lightTaskPoleRelationService.remove(Wrappers.lambdaUpdate(LightTaskPoleRelation.class)
+ .eq(LightTaskPoleRelation::getPoleId, lightTaskPoleRelation.getPoleId()).eq(LightTaskPoleRelation::getTaskId, lightTaskPoleRelation.getTaskId()));
+ });
+ //鍒犻櫎浠诲姟
+ lightTaskList.forEach(
+ taskId -> {
+ List<LightTaskPoleRelation> poleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
+ if (poleRelations.size() == 0) {
+ //涓嶅瓨鍦ㄤ换鍔″叧绯� 鍒犻櫎浠诲姟
+ removeById(taskId);
+ }
+ }
+ );
+ return "閮ㄥ垎浠诲姟鍒犻櫎鎴愬姛,娓呴櫎浠诲姟澶辫触鐨勪换鍔″強鏁版嵁淇濈暀";
+ }
}
/**
@@ -921,4 +939,33 @@
});
return true;
}
+
+
+ public Map checkTask(LightTaskParam param) {
+ /**
+ * 閲嶅浠诲姟鐨勭伅澶�
+ */
+ String lightAddress = param.getLightAddress();
+ List<Long> poleIdList = param.getPoleIdList();
+ List<LightTaskPoleRelation> lightTaskPoleRelations = lightTaskPoleRelationService.list(Wrappers.lambdaQuery(LightTaskPoleRelation.class)
+ .in(LightTaskPoleRelation::getPoleId, poleIdList).eq(LightTaskPoleRelation::getLightAddress, param.getLightAddress()));
+ List<Long> taskIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getTaskId).collect(Collectors.toList());
+ List<Long> poleIds = lightTaskPoleRelations.stream().map(LightTaskPoleRelation::getPoleId).collect(Collectors.toList());
+ //poleIds涓噸澶嶅厓绱犲彧淇濈暀涓�涓�
+ taskIds = taskIds.stream().distinct().collect(Collectors.toList());
+ poleIds = poleIds.stream().distinct().collect(Collectors.toList());
+ Map map = new HashMap();
+ if (!lightTaskPoleRelations.isEmpty()) {
+
+ map.put("request", "false");
+ map.put("msg", "浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
+ + "鐏潌id涓簕" + poleIds + "}");
+// throw new BusinessException("浠诲姟涓瓨鍦ㄥ凡鏈変换鍔＄殑鍗曠伅," + "浠诲姟id涓簕" + taskIds + "}, "
+// + "鐏潌id涓簕" + poleIds + "}");
+ } else {
+ map.put("request", "true");
+ map.put("msg", "浠诲姟涓棤閲嶅鐏潌鍦板潃");
+ }
+ return map;
+ }
}
--
Gitblit v1.9.3