From e573fe7a74e7801fe3ec101e9ef720b103cdaace Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 17:21:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
index 35416a8..58f8026 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java
@@ -5,6 +5,11 @@
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.service.DeviceOperationLogService;
import com.sandu.ximon.admin.service.InnerFrameDataService;
+import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.mapper.PoleBindingMapper;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* @author ZZQ
@@ -37,13 +42,38 @@
/**
* 淇濆瓨鎿嶄綔鏁版嵁
*
- * @param deviceCode
+ * @param deviceCodeList
* @param deviceName
* @param operation
* @param content
- * @param poleCode
*/
- public static void storeOperationData(String deviceCode, String deviceName, String operation, String content, String poleCode) {
- SpringContextHolder.getBean(DeviceOperationLogService.class).saveDeviceOperationLog(deviceCode, deviceName, operation, content, poleCode);
+ public static void storeOperationData(List deviceCodeList, String deviceName, String operation, String content) {
+ if (deviceCodeList == null) {
+ deviceCodeList = new ArrayList<>();
+ }
+ List<String> poleCodeList = new ArrayList<>();
+ for (Object str : deviceCodeList) {
+ Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, String.valueOf(str), null);
+ if (pole != null) {
+ poleCodeList.add(pole.getDeviceCode());
+ } else {
+ poleCodeList.add("");
+ }
+ }
+ SpringContextHolder.getBean(DeviceOperationLogService.class)
+ .saveDeviceOperationLog(deviceCodeList.toString(), deviceName, operation, content, poleCodeList.toString());
+ }
+
+ /**
+ * 鐧诲綍涓撳睘
+ *
+ * @param userId
+ * @param UserName
+ * @param operation
+ * @param content
+ */
+ public static void storeOperationLoginData(Long userId, String UserName, String operation, String content) {
+ SpringContextHolder.getBean(DeviceOperationLogService.class)
+ .storeOperationLoginData(userId, UserName, operation, content);
}
}
--
Gitblit v1.9.3