From 72046386cf8a85ad7dae79d82485fa60c2c421e6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 05 七月 2022 18:25:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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..c422df7 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
@@ -2,11 +2,11 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
+import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
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.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import java.util.ArrayList;
@@ -25,7 +25,7 @@
* @param a5Frame
* @param commonFrame
*/
- public static void storeInnerFrameData(String mac, String innerFrameTpye, A5Frame a5Frame, CommonFrame commonFrame) {
+ public static void storeInnerFrameData(String mac, String innerFrameTpye, IRequestFrame a5Frame, CommonFrame commonFrame) {
String reportInnerFrame = "";
if (commonFrame != null) {
reportInnerFrame = commonFrame.getConnectType() + commonFrame.getFunctionCode() + commonFrame.getOrderType() + commonFrame.getPayloadLength() + commonFrame.getPayload();
@@ -48,13 +48,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 +64,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