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 | 20 ++++++++++++++++----
1 files changed, 16 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 eca911c..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
@@ -6,7 +6,6 @@
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.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import java.util.ArrayList;
@@ -48,13 +47,13 @@
* @param operation
* @param content
*/
- public static void storeOperationData(List<String> deviceCodeList, String deviceName, String operation, String content) {
+ public static void storeOperationData(List deviceCodeList, String deviceName, String operation, String content) {
if (deviceCodeList == null) {
deviceCodeList = new ArrayList<>();
}
List<String> poleCodeList = new ArrayList<>();
- for (String str : deviceCodeList) {
- Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, str, null);
+ for (Object str : deviceCodeList) {
+ Pole pole = SpringContextHolder.getBean(PoleBindingMapper.class).getPoleByBinding(null, String.valueOf(str), null);
if (pole != null) {
poleCodeList.add(pole.getDeviceCode());
} else {
@@ -64,4 +63,17 @@
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