1.修改相信息报警，从A、B、C改为L1、L2、L3

pro/src/language_common.c

@@ -901,41 +901,41 @@ const char* language_alarm_phase_lose[LANG_MAX] =
 
 const char* language_alarm_phaseA_lose[LANG_MAX] = 
 {
-    "相位A缺失",
-    " Phase A Loss! ",
-    " Фаза A отсутствует！",
-    "Pérdida de fase A",
-    "Perda de fase A",
-    "Phasenverlust A",
-    "Perte de phase A",
-    "Perdita di fase A",
-    "位相A喪失",
+    "相位LI缺失",
+    " Phase LI Loss! ",
+    " Фаза LI отсутствует！",
+    "Pérdida de fase LI",
+    "Perda de fase LI",
+    "Phasenverlust LI",
+    "Perte de phase LI",
+    "Perdita di fase LI",
+    "位相LI喪失",
 } ;
 
 const char* language_alarm_phaseB_lose[LANG_MAX] = 
 {
-    "相位B缺失",
-    " Phase B Loss! ",
-    " Фаза B отсутствует！",
-    "Pérdida de fase B",
-    "Perda de fase B",
-    "Phasenverlust B",
-    "Perte de phase B",
-    "Perdita di fase B",
-    "位相B喪失",
+    "相位L2缺失",
+    " Phase L2 Loss! ",
+    " Фаза L2 отсутствует！",
+    "Pérdida de fase L2",
+    "Perda de fase L2",
+    "Phasenverlust L2",
+    "Perte de phase L2",
+    "Perdita di fase L2",
+    "位相L2喪失",
 } ;
 
 const char* language_alarm_phaseC_lose[LANG_MAX] = 
 {
-    "相位C缺失",
-    " Phase C Loss! ",
-    " Фаза C отсутствует！",
-    "Pérdida de fase C",
-    "Perda de fase C",
-    "Phasenverlust C",
-    "Perte de phase C",
-    "Perdita di fase C",
-    "位相C喪失",
+    "相位L3缺失",
+    " Phase L3 Loss! ",
+    " Фаза L3 отсутствует！",
+    "Pérdida de fase L3",
+    "Perda de fase L3",
+    "Phasenverlust L3",
+    "Perte de phase L3",
+    "Perdita di fase L3",
+    "位相L3喪失",
 } ;
 
 const char* language_alarm_RS485_master[LANG_MAX] = 

pro/src/sqlite_handle.c

@@ -4050,18 +4050,36 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     int languagesID=0;
     struct tm *t;
     char CtrlData[64];
+    char Phaseinfo[8];
     int alarm_action=-1;
     int limit_flag=0;
     GlobalTreeACManager *pwr=__globalPowerTemp;
 
-    memset(CtrlData,0,sizeof(CtrlData));
+    memset(CtrlData, 0, sizeof(CtrlData));
+    memset(Phaseinfo, 0, sizeof(Phaseinfo));
+
+    if (0 == __globalPowerTemp->product_ph_type)
+    {
+        sprintf(Phaseinfo, "L1");
+    }
+    else if (1 == __globalPowerTemp->product_ph_type)
+    {
+        sprintf(Phaseinfo, "L2");
+    }
+    else if (2 == __globalPowerTemp->product_ph_type)
+    {
+        sprintf(Phaseinfo, "L3");
+    }
+    else
+        sprintf(Phaseinfo, " ");
+
     switch (_AlarmType)
     {
     case ENABLE_TAC_V_UP:
     {
         alarm_action = __globalPowerTemp->global_over_manager.product_vol_over_upper_threshold_ctrl;
         get_message_CtrlType(alarm_action,CtrlData);
-        sprintf(AlarmText, "$通道$|CH%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_V[languagesID], language_alarm_Up[languagesID],CtrlData);
+        sprintf(AlarmText, "$通道$|CH%d %s |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id,Phaseinfo, language_alarm_V[languagesID], language_alarm_Up[languagesID],CtrlData);
         if(pwr->_PowerInfo.voltage>LIMIT_HOF(pwr->global_over_manager.product_vol_upper_threshold)) {
             limit_flag = 1;
         }
@@ -4071,7 +4089,7 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     {
         alarm_action = __globalPowerTemp->global_over_manager.product_vol_over_lower_threshold_ctrl;
         get_message_CtrlType(alarm_action,CtrlData);
-        sprintf(AlarmText, "$通道$|CH%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_V[languagesID], language_alarm_Down[languagesID],CtrlData);
+        sprintf(AlarmText, "$通道$|CH%d %s |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, Phaseinfo, language_alarm_V[languagesID], language_alarm_Down[languagesID],CtrlData);
         if(pwr->_PowerInfo.voltage<LIMIT_LOF(pwr->global_over_manager.product_vol_lower_threshold)) {
             limit_flag = 1;
         }
@@ -4081,7 +4099,7 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     {
         alarm_action = __globalPowerTemp->global_over_manager.product_cur_over_upper_threshold_ctrl;
         get_message_CtrlType(alarm_action,CtrlData);
-        sprintf(AlarmText, "$通道$|CH%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_A[languagesID], language_alarm_Up[languagesID],CtrlData);
+        sprintf(AlarmText, "$通道$|CH%d %s |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, Phaseinfo, language_alarm_A[languagesID], language_alarm_Up[languagesID],CtrlData);
         if(pwr->_PowerInfo.current>LIMIT_HOF(pwr->global_over_manager.product_cur_upper_threshold)) {
             limit_flag = 1;
         }
@@ -4091,7 +4109,7 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     {
         alarm_action = __globalPowerTemp->global_over_manager.product_pwr_over_upper_threshold_ctrl;
         get_message_CtrlType(alarm_action,CtrlData);
-        sprintf(AlarmText, "$通道$|CH%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_W[languagesID], language_alarm_Up[languagesID],CtrlData);
+        sprintf(AlarmText, "$通道$|CH%d %s |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, Phaseinfo, language_alarm_W[languagesID], language_alarm_Up[languagesID],CtrlData);
         if(pwr->_PowerInfo.consumption>LIMIT_HOF(pwr->global_over_manager.product_pwrcon_upper_threshold)) {
             limit_flag = 1;
         }
@@ -4101,7 +4119,7 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     {
         alarm_action = __globalPowerTemp->global_over_manager.product_pwrcon_over_upper_threshold_ctrl;
         get_message_CtrlType(alarm_action,CtrlData);
-        sprintf(AlarmText, "$通道$|CH%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_P[languagesID], language_alarm_Up[languagesID],CtrlData);
+        sprintf(AlarmText, "$通道$|CH%d %s |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, Phaseinfo, language_alarm_P[languagesID], language_alarm_Up[languagesID],CtrlData);
         if(pwr->_PowerInfo.power>LIMIT_HOF(pwr->global_over_manager.product_pwr_upper_threshold)) {
             limit_flag = 1;
         }
@@ -4125,7 +4143,7 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     break;
     case ENABLE_TAC_ETIME:
     default:
-        sprintf(AlarmText, "$通道$|CH%d%c |$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_NULL_ERROR[languagesID]);
+        sprintf(AlarmText, "$通道$|CH%d %s |$%s$", __globalPowerTemp->product_ch_id, Phaseinfo, language_alarm_NULL_ERROR[languagesID]);
         break;
     }
     time_t now;