From 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 09 九月 2022 11:34:13 +0800
Subject: [PATCH] 灯杆解绑fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 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 69f1a30..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,21 +2,35 @@
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.mapper.PoleBindingMapper;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* @author ZZQ
* @date 2022/5/13 15:06
*/
public class StoreOperationRecordsUtils {
- public static void storeInnerFrameData(String mac, String innerFrameTpye, A5Frame a5Frame, CommonFrame commonFrame) {
- String reportInnerFrame;
- if (commonFrame == null) {
- reportInnerFrame = "";
+ /**
+ * 淇濆瓨纭欢鎺у埗甯ф暟鎹�
+ *
+ * @param mac
+ * @param innerFrameTpye
+ * @param a5Frame
+ * @param 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();
}
String requstInnerFrame = a5Frame.getConnectType() + a5Frame.getFunctionCode() + a5Frame.getOrderType() + a5Frame.getPayloadLength() + a5Frame.getPayload();
- reportInnerFrame = commonFrame.getConnectType() + commonFrame.getFunctionCode() + commonFrame.getOrderType() + commonFrame.getPayloadLength() + commonFrame.getPayload();
String syncType;
if ("FE".equals(a5Frame.getConnectType())) {
syncType = "鍚屾";
@@ -24,11 +38,43 @@
syncType = "寮傛";
}
SpringContextHolder.getBean(InnerFrameDataService.class).storeInnerFrameData(mac, innerFrameTpye, syncType, requstInnerFrame, reportInnerFrame);
-
}
- public static void storeOperationData(String mac, String innerFrameTpye, String syncType, String requsetInnerFrame, String reportInnerFrame) {
- //TODO
+ /**
+ * 淇濆瓨鎿嶄綔鏁版嵁
+ *
+ * @param deviceCodeList
+ * @param deviceName
+ * @param operation
+ * @param 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 (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