From 5b9934c6f2eb1d8a82877ff312ef78ab06d71462 Mon Sep 17 00:00:00 2001
From: zhaojingkui <1553836110@qq.com>
Date: Wed, 19 Feb 2025 09:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8EMOOSDB=E7=9A=84=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84Key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pPowerManger/PowerManger.cpp | 26 +++++++++++++-------------
 src/pPowerManger/PowerManger.h   | 25 +++++++++++++++----------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/pPowerManger/PowerManger.cpp b/src/pPowerManger/PowerManger.cpp
index 62c699b..5eeff30 100644
--- a/src/pPowerManger/PowerManger.cpp
+++ b/src/pPowerManger/PowerManger.cpp
@@ -94,7 +94,7 @@ bool PowerManger::OnNewMail(MOOSMSG_LIST &NewMail)
     string key    = msg.GetKey();
 
     //处理上位机发送的控制指令
-    if(key == PM_MS_CMD_VAR)
+    if(key == DB_TO_PM_MSCMD)
     {
       string strJson = msg.GetString();
       if(getMsCmdFromJson(m_msCmd,strJson))
@@ -158,7 +158,7 @@ bool PowerManger::Iterate()
     disSysOption();
     //b. ccu操作 
     ccuOption();
-    //c. 输出报告
+    //c. 上位机反馈
     buildPowerSysReport();
   }
   //4. 打印错误信息
@@ -238,7 +238,7 @@ bool PowerManger::OnStartUp()
 void PowerManger::registerVariables()
 {
   AppCastingMOOSApp::RegisterVariables();
-  Register(PM_MS_CMD_VAR, 0);
+  Register(DB_TO_PM_MSCMD, 0);
 }
 
 
@@ -1135,11 +1135,11 @@ bool PowerManger::buildPowerSysReport()
   // pms[VAR_TO_STR(lbs_obj)] = lbs;
   // pms[VAR_TO_STR(dis_obj)] = dis;
 
-  Notify(PM_STATE_VAR,    pms.toStyledString());
-  Notify(PM_FCSSTATE_VAR, fcs.toStyledString());
-  Notify(PM_LIBATSTATE_VAR, lbs.toStyledString());
-  Notify(PM_DISSTATE_VAR, dis.toStyledString());
-  Notify(PM_CURRENTSTATE_VAR, currentBusState.toStyledString());
+  Notify(PM_TO_DB_STATE,    pms.toStyledString());
+  Notify(PM_TO_DB_FCSSTATE, fcs.toStyledString());
+  Notify(PM_TO_DB_LIBATSTATE, lbs.toStyledString());
+  Notify(PM_TO_DB_DISSTATE, dis.toStyledString());
+  Notify(PM_TO_DB_CURRENTSTATE, currentBusState.toStyledString());
   
   // 使用StreamWriterBuilder来设置保持插入顺序
   Json::StreamWriterBuilder builder;
@@ -1150,19 +1150,19 @@ bool PowerManger::buildPowerSysReport()
   string pathFile = "/home/zjk/project/H100/H100PowerManger/data/msg/";
   string jsonStr = Json::writeString(builder, pms);
 
-  saveStringToJsonFile(jsonStr, pathFile+PM_STATE_VAR+".json");
+  saveStringToJsonFile(jsonStr, pathFile+PM_TO_DB_STATE+".json");
 
   jsonStr = Json::writeString(builder, fcs);
-  saveStringToJsonFile(jsonStr, pathFile+PM_FCSSTATE_VAR+".json");
+  saveStringToJsonFile(jsonStr, pathFile+PM_TO_DB_FCSSTATE+".json");
 
   jsonStr = Json::writeString(builder, lbs);
-  saveStringToJsonFile(jsonStr, pathFile+PM_LIBATSTATE_VAR+".json");
+  saveStringToJsonFile(jsonStr, pathFile+PM_TO_DB_LIBATSTATE+".json");
 
   jsonStr = Json::writeString(builder, dis);
-  saveStringToJsonFile(jsonStr, pathFile+PM_DISSTATE_VAR + ".json");
+  saveStringToJsonFile(jsonStr, pathFile+PM_TO_DB_DISSTATE + ".json");
 
   jsonStr = Json::writeString(builder, currentBusState);
-  saveStringToJsonFile(jsonStr, pathFile+PM_CURRENTSTATE_VAR + ".json");
+  saveStringToJsonFile(jsonStr, pathFile+PM_TO_DB_CURRENTSTATE + ".json");
 
   return true;
 }
diff --git a/src/pPowerManger/PowerManger.h b/src/pPowerManger/PowerManger.h
index 26ea852..b011605 100644
--- a/src/pPowerManger/PowerManger.h
+++ b/src/pPowerManger/PowerManger.h
@@ -43,17 +43,22 @@
 #define SKEW_TOLERANCE 5
 
 //能源管理反馈的消息
-#define PM_STATE_VAR "uPower_pmState_st"
-#define PM_CURRENTSTATE_VAR "uPower_currentState_st"
-#define PM_DISSTATE_VAR "uPower_disSysState_st"
-#define PM_LIBATSTATE_VAR "uPower_liBatState_st"
-#define PM_FCSSTATE_VAR "uPower_fcsState_st"
+#define PM_TO_DB_STATE "uPower_pmState_st"
+#define PM_TO_DB_CURRENTSTATE "uPower_currentState_st"
+#define PM_TO_DB_DISSTATE "uPower_disSysState_st"
+#define PM_TO_DB_LIBATSTATE "uPower_liBatState_st"
+#define PM_TO_DB_FCSSTATE "uPower_fcsState_st"
+
+#define PM_TO_DB_SUBDISCMD "uPower_secdistState_cmd"
+#define PM_TO_DB_EQUIPMENTSTATE "uPower_equState_fb"
+
 //控制消息
-#define PM_MS_CMD_VAR "uPower_sysState_cmd"
-#define PM_SUBDIS_CMD_VAR "uPower_secdistState_cmd"
-#define PM_SUBDIS_STATE_VAR "uDevice_ secdistState _st"
-#define PM_EQUIPMENT_STATE_VAR "uPower_equState_fb"
-#define PM_EQUIPMENT_CMD_VAR "uPower_equState_cmd"
+//TODO:实现上位机交互控制功能
+#define DB_TO_PM_MSCMD "uPower_sysState_cmd"
+#define DB_TO_PM_EQUIPMENTCMD "uPower_equState_cmd"
+#define DB_TO_PM_SUBDISSTATE "uDevice_secdistState_st"
+
+
 
 class PowerManger : public AppCastingMOOSApp
 {