1、修改报警存在￥字符串问题；2、修改读不到控制板，不记录数据库。

pro/src/app.c

@@ -172,10 +172,11 @@ static void* power_thread(void* arg)
                                                 _globalDeviceManager->pCtrlBoard[i]._PowerInfo,
                                                 _globalDeviceManager->pCtrlBoard[i]._PowerWarninginfo);
                //暂时屏蔽，可能导致采集数据为0，后续需要优化处理逻辑或等E235控制板串口性能提升后再放开处理逻辑
-               // if(ret <0 )
-              //  {
-                 //   memset(&_globalDeviceManager->pCtrlBoard[i]._PowerInfo, 0, sizeof(PowerInfo)*AC_SINGLE_S_MAX_CHN_NUM );
-                //}
+               if(ret <0 )
+                {
+                   //memset(&_globalDeviceManager->pCtrlBoard[i]._PowerInfo, 0, sizeof(PowerInfo)*AC_SINGLE_S_MAX_CHN_NUM );
+                   continue;
+                }
             }
             // 输入总信息(三相)(后续应同步所有类型)
             if (_globalDeviceManager->pCtrlBoard[i].product_saddr != 0 && (_globalDeviceManager->pCtrlBoard[i].product_type == TREE_AC_TYPE||_globalDeviceManager->pCtrlBoard[i].product_type ==DOUBLE_AC_TYPE))
@@ -193,10 +194,11 @@ static void* power_thread(void* arg)
                                                     _globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerInfo,
                                                     _globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerWarninginfo);
                     //暂时屏蔽，可能导致采集数据为0，后续需要优化处理逻辑或等E235控制板串口性能提升后再放开处理逻辑
-                    //if(ret <0 )
-                   // {
-                     //   memset(&_globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerInfo, 0, sizeof(PowerInfo) *3);
-                   // }
+                    if(ret <0 )
+                    {
+                        //memset(&_globalDeviceManager->pCtrlBoard[i]._globalPowerInManger._PowerInfo, 0, sizeof(PowerInfo) *3);
+                        continue;
+                    }
                 }
                 //计算控制板每相输入总功率因数
 

pro/src/mail.c

@@ -481,7 +481,6 @@ int mail_post_alarm(int type, int subtype, int alarm_type, char *content)
         return -1;
     }
 
-    replace_sequences(content, h->dm->alarmTab);
     r = post_data(temp, content, NULL);
 #endif
 

pro/src/sqlite_handle.c

@@ -3983,6 +3983,8 @@ int dev_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,GlobalPowerMa
         sprintf(AlarmText,"$通道$|%s |$%s$",__globalPowerTemp->product_ch_name,language_alarm_NULL_ERROR[languagesID]);
         break;
     }
+    replace_sequences(AlarmText, globalDeviceManger->alarmTab);
+
     time_t now;
     time(&now);
     t = localtime(&now);
@@ -4164,6 +4166,8 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
         sprintf(AlarmText, "$通道$|CH%d %s |$%s$", __globalPowerTemp->product_ch_id, Phaseinfo, language_alarm_NULL_ERROR[languagesID]);
         break;
     }
+    replace_sequences(AlarmText, globalDeviceManger->alarmTab);
+
     time_t now;
     time(&now);
     t = localtime(&now);
@@ -4357,7 +4361,9 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         sprintf(AlarmText,"%s |$%s$",__globalPowerTemp->sensor_name,language_alarm_NULL_ERROR[languagesID]);
         break;
     }
-    
+
+    replace_sequences(AlarmText, globalDeviceManger->alarmTab);
+
     time_t now;
     time(&now);
     t = localtime(&now);