From 0a0f2442eedce9879378294ca930c2f113eeddd2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 16 五月 2022 11:44:06 +0800
Subject: [PATCH] 操作记录
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 79f924a..3dfff8f 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
@@ -47,6 +47,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
/**
* @author chenjiantian
@@ -89,19 +90,27 @@
throw new BusinessException("淇濆瓨璺伅浠诲姟澶辫触");
}
- List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());
-// SpringContextHolder.getBean(LightService.class).list(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, poleList.st)param.getPoleIdList());
- //鏍规嵁鐏潌code鏌ヨ璺伅淇℃伅 璺伅code涓庣伅鏉哻ode涓�涓�瀵瑰簲
- List<Light> lightList = SpringContextHolder.getBean(LightService.class).list(Wrappers.lambdaQuery(Light.class).in(Light::getDeviceCode, poleList.stream().map(Pole::getDeviceCode).toArray()));
+ /**
+ * 鏂板璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+ 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锛�" + lightTask.getTaskId()
+ "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+ "}锛寋鍐呭抚鎸囦护" + lightTask.getFramePayload()
+ "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鏂板璺伅浠诲姟", content, null);
-
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "鏂板璺伅浠诲姟", content, poleCodeList.toString());
+ /**
+ * 鏂板璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
List<Long> poleIdList = param.getPoleIdList();
if (CollectionUtil.isNotEmpty(poleIdList)) {
@@ -115,6 +124,21 @@
// 涓�涓伅鏉嗗彧鑳戒娇鐢ㄤ竴涓换鍔★紝鏂颁换鍔¤瑕嗙洊鏃т换鍔�
lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getPoleId, poleIdList).ne(LightTaskPoleRelation::getTaskId, lightTask.getTaskId()));
+
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍寮�濮�
+ */
+
+ String content1 = "{浠诲姟ID锛�" + lightTask.getTaskId()
+ + "锛� 浠诲姟鍚嶏細" + lightTask.getTaskName()
+ + "}锛寋鍐呭抚鎸囦护" + lightTask.getFramePayload()
+ + "锛� 鐏潌ID锛�" + param.getPoleIdList().toString()
+ + "锛� 鎺у埗鐨勭伅澶村湴鍧�锛�" + param.getLightAddress()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(poleCodeList.toString(), null, "涓嬪彂璺伅浠诲姟", content1, poleCodeList.toString());
+ /**
+ * 涓嬪彂璺伅浠诲姟鏃ュ織璁板綍缁撴潫
+ */
}
return true;
}
--
Gitblit v1.9.3