完善了显示,修改了复合管控的通信协议

src/pPowerManger/upmsg/uExternComm_setDeviceSwitch.h

@@ -16,7 +16,7 @@ public:
         Json::Value root;
         Json::CharReaderBuilder builder;
         JSONCPP_STRING errs;
-        DeviceSwitchCmd cmd;
+        DeviceSwitchCmd cmd{};
         // 解析JSON字符串
         std::istringstream stream(msg);
         if (!Json::parseFromStream(builder, stream, &root, &errs)) {
@@ -40,4 +40,4 @@ public:
     };
 };
 
-#endif
+#endif

src/pPowerManger/upmsg/uPlan_taskStart.h

@@ -16,7 +16,7 @@ public:
     ~uPlan_taskStartMsg(){};
 
     MissionState getMission(const std::string& key, const std::string& msg) {
-        MissionState mission;
+        MissionState mission{};
         Json::Value root;
         Json::CharReaderBuilder builder;
         JSONCPP_STRING errs;

src/pPowerManger/upmsg/uPower_disSysState.h

@@ -21,20 +21,15 @@ public:
     {
         //构建配电系统状态报告
         Json::Value dis;
-        disBus1Breaker* pdis1=new disBus1Breaker;
-        disBus2Breaker* pdis2=new disBus2Breaker;
-        disBus3Breaker* pdis3=new disBus3Breaker;
-        disBus4Breaker* pdis4=new disBus4Breaker;
+        disBus1Breaker dis1 = currentDisBreakerState.bus1Breaker;
+        disBus2Breaker dis2 = currentDisBreakerState.bus2Breaker;
+        disBus3Breaker dis3 = currentDisBreakerState.bus3Breaker;
+        disBus4Breaker dis4 = currentDisBreakerState.bus4Breaker;
 
-        *pdis1 = currentDisBreakerState.bus1Breaker;
-        *pdis2 = currentDisBreakerState.bus2Breaker;
-        *pdis3 = currentDisBreakerState.bus3Breaker;
-        *pdis4 = currentDisBreakerState.bus4Breaker;
-
-        dis["HVolBusBreaker_uint16"]  = *(unsigned short*)pdis1;
-        dis["HVolABusBreaker_unit16"] = *(unsigned short*)pdis2;
-        dis["HVolBBusBreaker_unit16"] = *(unsigned short*)pdis3;
-        dis["LVolBusBreaker_uint16"]  = *(unsigned short*)pdis4;
+        dis["HVolBusBreaker_uint16"]  = *(unsigned short*)&dis1;
+        dis["HVolABusBreaker_unit16"] = *(unsigned short*)&dis2;
+        dis["HVolBBusBreaker_unit16"] = *(unsigned short*)&dis3;
+        dis["LVolBusBreaker_uint16"]  = *(unsigned short*)&dis4;
         
         //TODO: 构建配电系统故障码
         Json::Value faultCodeDis_array = Json::Value(Json::arrayValue);
@@ -50,4 +45,4 @@ public:
     }
 };
 
-#endif
+#endif

src/pPowerManger/upmsg/uPower_pmState.h

@@ -11,7 +11,15 @@ private:
     /* data */
 public:
     uPower_pmStateMsg() {
-        memset(&state, 0, sizeof(state));
+        state.workCondition = 0;
+        state.currentMod = 0;
+        state.powerState = 0;
+        state.faultLevel = 0;
+        state.faultCode.clear();
+        state.soc = 0;
+        state.sustainableTime = 0;
+        state.m_faultNum = 0;
+        state.m_leakage = 0;
     };
     ~uPower_pmStateMsg() {};
     std::string key = "uPower_pmState_fb";
@@ -59,4 +67,4 @@ public:
     }
 };
 
-#endif
+#endif