From fb842a99734726e628bd0981ccdf80a253534eaa Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 17:06:07 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 a158b9f..d4d8cae 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
@@ -105,7 +105,7 @@
+ "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "鏂板璺伅浠诲姟", content, poleCodeList.toString());
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "鏂板璺伅浠诲姟", content);
/**
* 鏂板璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
@@ -129,9 +129,9 @@
String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
- + "},"+" 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "涓嬪彂璺伅浠诲姟", content1, poleCodeList.toString());
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
@@ -181,7 +181,7 @@
+ "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "缂栬緫璺伅浠诲姟", content, poleCodeList.toString());
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "缂栬緫璺伅浠诲姟", content);
/**
* 缂栬緫璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
@@ -206,9 +206,9 @@
String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
- + "},"+" 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + "}," + " 鐏潌ID锛�" + param.getPoleIdList().toString()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "涓嬪彂璺伅浠诲姟", content1, poleCodeList.toString());
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content1);
/**
* 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
*/
@@ -334,6 +334,14 @@
}
);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鎺х伅浠诲姟id锛�" + taskIdList + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎鎺х伅浠诲姟", content);
+ /**
+ * 鍒犻櫎鎺х伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
return true;
}
@@ -407,16 +415,30 @@
}
String framePayload = buildControlFramePayload(lightTask.getOpenOrder(), lightTask.getCloseOrder(), lightTask.getControlOrder(), lightTask.getWeek());
List<LightTaskPoleRelation> lightTaskPoleRelationList = sendControllerFrame(lightTask, ListUtil.toList(param.getPoleId()), framePayload, lightTask.getLightAdress());
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ List<String> poleCodeList = new ArrayList<>();
+ List<Pole> list = SpringContextHolder.getBean(PoleService.class).list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, param.getPoleId()));
+ if (CollectionUtil.isNotEmpty(list)) {
+ poleCodeList = list.stream().map(Pole::getDeviceCode).collect(Collectors.toList());
+ }
+ String content = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+ + "}," + " 鐏潌ID锛�" + param.getPoleId()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList, null, "涓嬪彂璺伅浠诲姟", content);
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
+
+
if (CollectionUtil.isNotEmpty(lightTaskPoleRelationList)) {
return lightTaskPoleRelationService.update(lightTaskPoleRelationList.get(0),
Wrappers.lambdaUpdate(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, param.getPoleId())
.eq(LightTaskPoleRelation::getTaskId, param.getTaskId()));
}
-
- /**
- * 涓嬪彂鍗曠伅浠诲姟-鏃ュ織
- */
- String content = "涓嬪彂鍗曠伅浠诲姟";
return true;
--
Gitblit v1.9.3