From feac6e0c2db4e60d55417fde1971a0bc6d703566 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 15:58:28 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index 949e42e..4e1d2bd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -33,6 +33,7 @@
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -312,7 +313,7 @@
             throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
         }
         CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
-        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-蹇冭烦鍖�", a5Frame, commonFrame);
+        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-寮�濮嬪厖鐢�", a5Frame, commonFrame);
         System.out.println(commonFrame + "            -----commonFrame");
 
 
@@ -346,7 +347,7 @@
             throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
         }
         CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
-        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-蹇冭烦鍖�", a5Frame, commonFrame);
+        StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-缁撴潫鍏呯數", a5Frame, commonFrame);
         System.out.println(commonFrame + "            -----commonFrame");
 
         A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
@@ -862,7 +863,23 @@
             c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
         }
         c3mCharging.setC3Mac(c3ChargingAddParam.getC3Mac());
-        return save(c3mCharging);
+        /**
+         * 娣诲姞鍏呯數妗� 鏃ュ織璁板綍寮�濮�
+         */
+        List<String> listCode = new ArrayList<>(1);
+        listCode.add(c3mCharging.getMcuUdid());
+        String content = "{璁惧code锛�" + c3mCharging.getMcuUdid() + "璁惧鍚�:" + c3mCharging.getC3Name() +
+                "}";
+
+        StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞鍏呯數妗�", content);
+        /**
+         * 娣诲姞鍏呯數妗� 鏃ュ織璁板綍缁撴潫
+         */
+
+        return
+
+                save(c3mCharging);
+
     }
 
     public boolean updateC3ChargingName(C3ChargingAddParam c3ChargingAddParam) {
@@ -877,6 +894,21 @@
         C3mCharging c3mCharging = new C3mCharging();
         c3mCharging.setC3Id(c3ChargingAddParam.getC3Id());
         c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
+
+        /**
+         * 淇敼鍏呯數妗� 鏃ュ織璁板綍寮�濮�
+         */
+        List<String> listCode = new ArrayList<>(1);
+        listCode.add(c3mCharging.getMcuUdid());
+        String content = "{璁惧code锛�" + c3mCharging.getMcuUdid() + "璁惧鍘熷悕:" + one.getC3Name() + "鏇存敼鍚庣殑璁惧鍚�:" + c3mCharging.getC3Name() +
+                "}";
+
+        StoreOperationRecordsUtils.storeOperationData(listCode, null, "缂栬緫鍏呯數妗�", content);
+        /**
+         * 淇敼鍏呯數妗� 鏃ュ織璁板綍缁撴潫
+         */
+
+
         return updateById(c3mCharging);
     }
 

--
Gitblit v1.9.3