From 7417c7506a4b52c124ace7e3408c611a47e1085f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 15:41:54 +0800
Subject: [PATCH] 单灯任务帧指令日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 378 +++++++++++++++++-------------------------------------
1 files changed, 119 insertions(+), 259 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 53f2370..908e53a 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,10 +16,12 @@
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;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightTimerRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
@@ -147,10 +149,6 @@
}
- //璁板綍浠诲姟缂栬緫鍣ㄥ墠鐏潌ID
- List<LightTaskStatusAndPole> oldLightTaskStatusAndPoles = lightTaskPoleRelationService.listPoleAndStatusIdByTaskId(taskId);
-
-
int week = 0;
for (Integer w : param.getWeekList()) {
week |= w;
@@ -171,180 +169,6 @@
newLightTask.setUpdateTime(LocalDateTime.now());
newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
- if (!save(newLightTask)) {
- throw new BusinessException("缂栬緫浠诲姟澶辫触");
- }
-
- /**
- * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
- */
-// List<String> poleCodeList = new ArrayList<>();
-// if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
-// List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
-// if (CollectionUtil.isNotEmpty(poleList)) {
-// poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
-// }
-// }
-// String content = "{浠诲姟ID锛�" + newLightTask.getTaskId()
-// + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
-// + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload()
-// + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
-// + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
-// + " }";
-// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
- /**
- * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
-
- List<Long> poleIdList = param.getPoleIdList();
- if (CollectionUtil.isNotEmpty(poleIdList)) {
- List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(newLightTask, poleIdList, lightTask.getFramePayload(), param.getLightAddress());
- //鐘舵�佷笉涓�0 鏂板缓浠诲姟
- lightTaskPoleRelationList.forEach(taskResult -> {
- //淇濆瓨涓嬪彂澶辫触鐨勪换鍔″叧鑱斿叧绯伙紝鐘舵�佷负O鎴愬姛锛屽叾浠栫姸鎬侀兘涓哄け璐�
- if (taskResult.getIssueStatus() == 0) {
- for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
- if (bean.getId().equals(taskResult.getPoleId())) {
- oldLightTaskStatusAndPoles.remove(bean);
- break;
- }
- }
- }
- });
- //淇敼鐏潌浠诲姟缁戝畾鍏崇郴琛�
- for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
- LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
-
- //鎴愬姛鎵嶄慨鏀癸紝澶辫触涓嶅彉
- if (bean.getIssueStatus() == 0) {
- if (one != null) {
- one.setTaskId(newLightTask.getTaskId());
- lightTaskPoleRelationService.updateById(one);
- } else {
- lightTaskPoleRelationService.save(bean);
- }
- } else {
- if (one == null) {
- lightTaskPoleRelationService.save(bean);
- }
-
- }
- }
-
- List<Long> failPoleId = new ArrayList<>();
- for (LightTaskStatusAndPole bean1 : oldLightTaskStatusAndPoles) {
- failPoleId.add(bean1.getId());
- }
- //鎵ц鍏崇伅
- String framePayloadClose = "7f0000007f173b00";
-
- List<LightTaskPoleRelation> lightTaskPoleRelations = new ArrayList<>();
- if (!failPoleId.isEmpty()) {
- lightTaskPoleRelations = sendControllerFrame(lightTask, failPoleId, framePayloadClose, lightTask.getLightAdress());
- }
-
- //鐘舵�佷笉涓�0 鏂板缓浠诲姟
- lightTaskPoleRelations.forEach(taskResult -> {
- //淇濆瓨涓嬪彂澶辫触鐨勪换鍔″叧鑱斿叧绯伙紝鐘舵�佷负O鎴愬姛锛屽叾浠栫姸鎬侀兘涓哄け璐�
- if (taskResult.getIssueStatus() == 0) {
- for (LightTaskStatusAndPole bean : oldLightTaskStatusAndPoles) {
- if (bean.getId().equals(taskResult.getPoleId())) {
- oldLightTaskStatusAndPoles.remove(bean);
- lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()).eq(LightTaskPoleRelation::getPoleId, bean.getId()));
- break;
- }
- }
- }
- });
-
-
- //浠诲姟椤哄埄瀹屾垚
- if (oldLightTaskStatusAndPoles.size() == 0) {
- removeById(lightTask);
- }
-
-
-// // 娣诲姞缁戝畾鐏潌
-// if (!lightTaskPoleRelationService.saveBatch(lightTaskPoleRelationList)) {
-// throw new BusinessException("缁戝畾鐏潌澶辫触");
-// }
-//
-// // 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
-// lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
-
- /**
- * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
- */
-
-// String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
-// + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
-// + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
-// + " }";
-// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
- /**
- * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
- }
-
- return true;
- }
-
-
- @Transactional(rollbackFor = Exception.class)
- public boolean 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) {
- throw new BusinessException("鎵句笉鍒拌矾鐏换鍔�");
- }
-
-
- int week = 0;
- for (Integer w : param.getWeekList()) {
- week |= w;
- }
-
- LightTask newLightTask = new LightTask();
- newLightTask.setTaskName(param.getTaskName());
- if (SecurityUtils.getClientId() != null) {
- lightTask.setClientId(clientService.getClientId());
- lightTask.setUserId(SecurityUtils.getUserId());
- }
- newLightTask.setWeek(week);
- newLightTask.setCreateUser(SecurityUtils.getUsername());
- newLightTask.setControlOrder(param.getControlOrder());
- newLightTask.setOpenOrder(param.getOpenOrder());
- newLightTask.setCloseOrder(param.getCloseOrder());
- newLightTask.setLightAdress(param.getLightAddress());
- newLightTask.setUpdateTime(LocalDateTime.now());
- newLightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
-
-// if (!save(newLightTask)) {
-// throw new BusinessException("缂栬緫浠诲姟澶辫触");
-// }
-
- /**
- * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
- */
-// List<String> poleCodeList = new ArrayList<>();
-// if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
-// List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
-// if (CollectionUtil.isNotEmpty(poleList)) {
-// poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
-// }
-// }
-// String content = "{浠诲姟ID锛�" + newLightTask.getTaskId()
-// + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
-// + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload()
-// + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
-// + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
-// + " }";
-// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
- /**
- * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
//缂栬緫鍚庣伅鏉咺D闆嗗悎
List<Long> poleIdList = param.getPoleIdList();
@@ -360,85 +184,104 @@
List<Long> closeLight = oldList.stream().filter(poleId -> !param.getPoleIdList().contains(poleId)).collect(Collectors.toList());
- if (CollectionUtil.isNotEmpty(poleIdList)) {
- List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
- if (CollectionUtil.isNotEmpty(newPoleIdList)) {
- //鏂扮伅鏉嗕笅鍙戞柊浠诲姟
- Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ List<LightTaskPoleRelation> newPoleAll = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(newPoleIdList)) {
+ //鏂扮伅鏉嗕笅鍙戞柊浠诲姟
+ Map<String, List<LightTaskPoleRelation>> newPoleMap = sendControllerFrame(newPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
- //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
- newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
- }
-
- List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
- List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
- if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
- //瑕嗙洊鎿嶄綔鐏潌
- Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
- oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
- }
-
- List<LightTaskPoleRelation> closePoleFail = 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<>());
- }
-
- //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕�
- if (closePoleFail.size() == 0 && oldPoleFail.size() == 0) {
- newLightTask.setTaskId(lightTask.getTaskId());
- updateById(newLightTask);
- } else {
- save(newLightTask);
- }
-
- for (LightTaskPoleRelation bean : newPoleAll) {
- 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(newPoleAll);
- 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);
-
-
- /**
- * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
- */
-
-// String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
-// + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
-// + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
-// + " }";
-// StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
- /**
- * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
- */
+ //newPoleAll闆嗗悎鍚庨潰鐢ㄤ簬瀛樺偍鍏崇郴琛�
+ newPoleAll = newPoleMap.getOrDefault("all", new ArrayList<>());
}
+
+ List<LightTaskPoleRelation> oldPoleFail = new ArrayList<>();
+ List<LightTaskPoleRelation> oldPoleSuccess = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(oldPoleIdList)) {
+ //瑕嗙洊鎿嶄綔鐏潌
+ Map<String, List<LightTaskPoleRelation>> oldPoleMap = sendControllerFrame(oldPoleIdList, lightTask.getFramePayload(), param.getLightAddress());
+ oldPoleFail = oldPoleMap.getOrDefault("fail", new ArrayList<>());
+ oldPoleSuccess = oldPoleMap.getOrDefault("success", new ArrayList<>());
+ }
+
+ List<LightTaskPoleRelation> closePoleFail = 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<>());
+ }
+
+ //鏈夊け鏁楃殑闇�瑕佷繚瀛樻棫鐨勪换鍕�
+ if (closePoleFail.size() == 0 && oldPoleFail.size() == 0) {
+ newLightTask.setTaskId(lightTask.getTaskId());
+ updateById(newLightTask);
+ } else {
+ save(newLightTask);
+ }
+
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ List<String> poleCodeList = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(param.getPoleIdList())) {
+ List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
+ if (CollectionUtil.isNotEmpty(poleList)) {
+ poleCodeList = poleList.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
+ }
+ }
+ String content = "{浠诲姟ID锛�" + newLightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
+ + "}锛寋鍐呭抚鎸囦护" + newLightTask.getFramePayload()
+ + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
+ /**
+ * 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
+ for (LightTaskPoleRelation bean : newPoleAll) {
+ 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(newPoleAll);
+ 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);
+
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ String content1 = "{浠诲姟ID锛�" + newLightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + newLightTask.getTaskName()
+ + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
return true;
}
@@ -454,6 +297,9 @@
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();
WrapResponseCommonFrame<A5LightTimerRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceCode, requestFrame, A5LightTimerRespInnerFrame.class);
+
+ StoreOperationRecordsUtils.storeInnerFrameData(deviceCode, "鍗曠伅甯�-鎺х伅", requestFrame, responseCommonFrame);
+
return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
}
@@ -504,8 +350,15 @@
return page;
}
-
- // 姣忎釜璺伅鍙戦�佹帶鍒跺抚 杩斿洖鍏宠仈鍒楄〃
+ /**
+ * 鐢ㄤ簬浠诲姟鏂板,涓嬪彂
+ *
+ * @param lightTask
+ * @param poleIdList
+ * @param framePayload
+ * @param lightAddress
+ * @return
+ */
private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload, String lightAddress) {
List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
//鎴愬姛
@@ -523,7 +376,7 @@
for (Pole pole : poles) {
LightTaskPoleRelation lightTaskPoleRelation = new LightTaskPoleRelation();
lightTaskPoleRelation.setPoleId(pole.getId());
-// lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
+ lightTaskPoleRelation.setTaskId(lightTask.getTaskId());
// rrpc 鍙戠敓瀹氭椂鍛戒护
try {
A5LightTimerRespInnerFrame a5LightTimerRespInnerFrame = sendTimeRRpc(framePayload, pole.getDeviceCode(), lightAddress);
@@ -541,7 +394,14 @@
return lightTaskPoleRelationList;
}
-
+ /**
+ * 鐢ㄤ簬浠诲姟缂栬緫
+ *
+ * @param poleIdList
+ * @param framePayload
+ * @param lightAddress
+ * @return
+ */
private Map<String, List<LightTaskPoleRelation>> sendControllerFrame(List<Long> poleIdList, String framePayload, String lightAddress) {
List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();
//鎴愬姛
--
Gitblit v1.9.3