From 26d8dda66a3225a74e3ce1cf6517636c81cb007e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 11:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/StoreOperationRecordsUtils.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 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 a4897d6..1c8b5a4 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
@@ -3,13 +3,27 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
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 {
+ /**
+ * 淇濆瓨纭欢鎺у埗甯ф暟鎹�
+ *
+ * @param mac
+ * @param innerFrameTpye
+ * @param a5Frame
+ * @param commonFrame
+ */
public static void storeInnerFrameData(String mac, String innerFrameTpye, A5Frame a5Frame, CommonFrame commonFrame) {
String reportInnerFrame = "";
if (commonFrame != null) {
@@ -23,11 +37,30 @@
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());
}
}
--
Gitblit v1.9.3