From 51af3e4e7c5fb612576b98fd6407f6b65859f374 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期三, 16 十一月 2022 15:58:06 +0800
Subject: [PATCH] 区分消息订阅类型，新增上下线监听，修复定时帧缺少CRC32，替换设备在线状态查询方法
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 120 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 31 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..2920df7 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
@@ -16,6 +16,7 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
+import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightTimerReqInnerFrame;
@@ -83,7 +84,6 @@
if (!"0001".equals(param.getLightAddress()) && !"0002".equals(param.getLightAddress())) {
throw new BusinessException("鐏ご鍦板潃鏍煎紡涓嶆纭�");
}
-// LightTask lightTask = getById(null);
int week = 0;
@@ -144,12 +144,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 +207,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 +221,6 @@
week |= w;
}
-// LightTask newLightTask = new LightTask();
newLightTask.setTaskName(param.getTaskName());
newLightTask.setClientId(clientService.getClientId(SecurityUtils.getUserId()));
@@ -289,10 +285,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<>();
@@ -300,8 +298,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<>());
+ }
}
@@ -313,8 +313,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<>());
+ }
}
@@ -340,8 +342,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 +382,7 @@
//涓嬪彂鎴愬姛 鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
commend.setDeviceScheduled(JSON.toJSONString(newLightTask));
}
+
}
});
@@ -369,19 +393,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);
@@ -413,10 +432,25 @@
* @return 杩斿洖甯�
*/
public A5LightTimerRespInnerFrame sendTimeRRpc(String framePayload, String deviceCode, String lightAddress) {
- IRequestFrame requestFrame = FrameBuilder.builderA5().innerFrame(new A5LightTimerReqInnerFrame(framePayload, lightAddress)).orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).build();
+// IRequestFrame requestFrame = FrameBuilder.
+// builderA5().
+// innerFrame(
+// new A5LightTimerReqInnerFrame
+// (framePayload, lightAddress)
+// ).
+// orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).
+// build();
+
+ A5LightTimerReqInnerFrame
+ a5LightTimerReqInnerFrame = new A5LightTimerReqInnerFrame(framePayload, lightAddress);
+ System.out.println(JSON.toJSONString(a5LightTimerReqInnerFrame) + " --------a5LightTimerReqInnerFrame");
+
+ A5Frame requestFrame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), a5LightTimerReqInnerFrame);
System.out.println(requestFrame + " --------requestFrame");
- WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
+ WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame
+ = MainBoardInvokeSyncService.getInstance().sendRRPC
+ (deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
System.out.println(responseCommonFrame + " -----------responseCommonFrame");
StoreOperationRecordsUtils.storeInnerFrameData(deviceCode, "鍗曠伅甯�-鎺х伅", requestFrame, responseCommonFrame);
return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
@@ -652,6 +686,10 @@
//瀛樺湪浠诲姟鍏崇郴 涓嬪彂娓呴櫎浠诲姟鎸囦护
Map<String, List<LightTaskPoleRelation>> ffff = sendControllerFrame(poleIds, "", byId.getLightAdress());
+ if (ffff == null) {
+ throw new BusinessException("鍒犻櫎澶辫触");
+ }
+
/**
* 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
*/
@@ -715,6 +753,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 +832,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 +865,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