Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/appweb_handle.c

@@ -1433,7 +1433,7 @@ static void sensorStatusMonitoring(void* conn)
             else
             {
                 _overSensorBackInfoTemp->connectionStatus = -1;
-                strcpy(_overSensorBackInfoTemp->sensorvaluech, "IN");
+                strcpy(_overSensorBackInfoTemp->sensorvaluech,_overSensorBackInfoTemp->comSlogan);
                 _overSensorBackInfoTemp->nodeNumber =_globalSensorManagerTemp->sensor_addr;
             }
 

pro/src/json_handle.c

@@ -2838,7 +2838,7 @@ char *ws_sensor_status_ack_to_json(GlobalSensorManger *_globalSensorManger)
         else
         {
             _overSensorBackInfoTemp->connectionStatus = -1;
-            strcpy(_overSensorBackInfoTemp->sensorvaluech, "IN");
+            strcpy(_overSensorBackInfoTemp->sensorvaluech, _overSensorBackInfoTemp->comSlogan);
             _overSensorBackInfoTemp->nodeNumber = _globalSensorManagerTemp->sensor_addr;
         }
 

pro/src/sqlite_handle.c

@@ -3133,6 +3133,18 @@ int dev_delete_power_ds(sqlite3 *db,int product_id,int nChn,_PowerDSManage_t* _p
     return 0;
 }
 
+void get_message_CtrlType(int nCtrlType,char* message)
+{
+    switch (nCtrlType)
+    {
+    case 1:
+        sprintf(message, "|$通道$|$关闭$");
+        break;
+    default:
+        break;
+    }
+}
+
 /**
  * @brief 发送设备告警信息
  *
@@ -3147,33 +3159,40 @@ int dev_delete_power_ds(sqlite3 *db,int product_id,int nChn,_PowerDSManage_t* _p
 int dev_Alarm_send_message(GlobalDeviceManager* __globalDeviceManger,GlobalPowerManger* __globalPowerTemp,int _AlarmType)
 {
     char AlarmText[256];
-    int languagesID=0;
-    struct tm* t ;
+    int languagesID = 0;
+    struct tm *t;
+    char CtrlData[64];
+    memset(CtrlData, 0, sizeof(CtrlData));
     switch (_AlarmType)
     {
     case WARNING_V_UP:
     {
-        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$",__globalPowerTemp->product_ch_name,language_alarm_V[languagesID],language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_vol_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$| %s",__globalPowerTemp->product_ch_name,language_alarm_V[languagesID],language_alarm_Up[languagesID],CtrlData);
     }
         break;
     case WARNING_V_DOWN:
     {
-        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$",__globalPowerTemp->product_ch_name,language_alarm_V[languagesID],language_alarm_Down[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_vol_over_lower_threshold_ctrl,CtrlData);
+        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$| %s",__globalPowerTemp->product_ch_name,language_alarm_V[languagesID],language_alarm_Down[languagesID],CtrlData);
     }
         break;
     case WARNING_A_UP:
     {
-        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$",__globalPowerTemp->product_ch_name,language_alarm_A[languagesID],language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_cur_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$| %s",__globalPowerTemp->product_ch_name,language_alarm_A[languagesID],language_alarm_Up[languagesID],CtrlData);
     }        
         break;
     case WARNING_W_UP:
     {
-        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$",__globalPowerTemp->product_ch_name,language_alarm_W[languagesID],language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_pwr_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$| %s",__globalPowerTemp->product_ch_name,language_alarm_W[languagesID],language_alarm_Up[languagesID],CtrlData);
     }
         break;
     case WARNING_P_UP:
     {
-        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$",__globalPowerTemp->product_ch_name,language_alarm_P[languagesID],language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_pwrcon_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText,"$通道$|%s |$%s$|$%s$| %s",__globalPowerTemp->product_ch_name,language_alarm_P[languagesID],language_alarm_Up[languagesID],CtrlData);
     }
         break;
     default:
@@ -3274,31 +3293,38 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* __globalDeviceManger,GlobalTreeA
         char AlarmText[256];
     int languagesID=0;
     struct tm *t;
+    char CtrlData[64];
+    memset(CtrlData,0,sizeof(CtrlData));
     switch (_AlarmType)
     {
     case ENABLE_TAC_V_UP:
     {
-        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_V[languagesID], language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_vol_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_V[languagesID], language_alarm_Up[languagesID],CtrlData);
     }
     break;
     case ENABLE_TAC_V_DOWN:
     {
-        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_V[languagesID], language_alarm_Down[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_vol_over_lower_threshold_ctrl,CtrlData);
+        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_V[languagesID], language_alarm_Down[languagesID],CtrlData);
     }
     break;
     case ENABLE_TAC_A_UP:
     {
-        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_A[languagesID], language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_cur_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_A[languagesID], language_alarm_Up[languagesID],CtrlData);
     }
     break;
     case ENABLE_TAC_W_UP:
     {
-        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_W[languagesID], language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_pwr_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_W[languagesID], language_alarm_Up[languagesID],CtrlData);
     }
     break;
     case ENABLE_TAC_P_UP:
     {
-        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_P[languagesID], language_alarm_Up[languagesID]);
+        get_message_CtrlType(__globalPowerTemp->global_over_manager->product_pwrcon_over_upper_threshold_ctrl,CtrlData);
+        sprintf(AlarmText, "$通道$|%d%c |$%s$|$%s$| %s", __globalPowerTemp->product_ch_id, 'A' + __globalPowerTemp->product_ph_type, language_alarm_P[languagesID], language_alarm_Up[languagesID],CtrlData);
     }
     break;
     case ENABLE_TAC_STIME: