smtp报警信息标题添加产品名称

pro/src/app.c

@@ -38,35 +38,6 @@ static void get_time(char *ts)
     tm = localtime(&tv.tv_sec);
     sprintf(ts, "%04d-%02d-%02d %02d:%02d:%02d.%03ld", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec/1000);
 }
-static void db_ow_test(sqlite3 *db, int *index, int *index3)
-{
-    int i,ow_flag=0;
-    GlobalPowerInfo info;
-    GlobalTreeACManager info3;
-    int idx=1;
-    char temp[100];
-
-    dev_sql_set_overwrite(0);
-    for(i=0; i<200; i++) {
-        get_time(info.samp_time);
-        dev_insert_power_info(db, &info, index);
-        dev_insert_t_ac_power_info(db, &info3, index3, info.samp_time);
-
-        sprintf(temp, "alarm %d", idx++);
-        dev_insert_alarm_info(db, 0, ALARM_TYPE_POWER, info.samp_time, temp);
-    }
-    dev_sql_set_overwrite(1);
-
-    for(i=0; i<10; i++) {
-        get_time(info.samp_time);
-
-        dev_insert_power_info(db, &info, index);
-        dev_insert_t_ac_power_info(db, &info3, index3, info.samp_time);
-
-        sprintf(temp, "alarm %d", idx++);
-        dev_insert_alarm_info(db, 0, ALARM_TYPE_POWER, info.samp_time, temp);
-    }
-}
 
 #include "file.h"
 #define REG_UPG_READ        1501
@@ -265,8 +236,7 @@ void* power_thread(void* arg)
         }
         //usleep(300000);
     }
-
-    //db_ow_test(_globalDeviceManager->db, &lastIndex, &lastIndex3);
+    
     //采集线程
     while (h->quit==0)
     {

pro/src/smtp.c

@@ -4237,6 +4237,7 @@ int smtp_post_alarm(int type, int subtype, int alarm_type, char *content)
     if(!h->inited) {
         return -1;
     }
+    char *prod_name=h->dm->_globalDevInfo.product.name;
     int prod_id=h->dm->_globalDevInfo.product.id;
     int langID=h->dm->_globalDevInfo.product.language;
 
@@ -4247,24 +4248,24 @@ int smtp_post_alarm(int type, int subtype, int alarm_type, char *content)
                 switch(alarm_type) {
                     case ENABLE_TAC_V_UP:
                     case ENABLE_TAC_V_DOWN:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_V[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_V[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case ENABLE_TAC_A_UP:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_A[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_A[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case ENABLE_TAC_W_UP:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_W[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_W[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case ENABLE_TAC_P_UP:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_P[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_P[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case ENABLE_TAC_STIME:
                     case ENABLE_TAC_ETIME:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_alarm_phase_lose[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_alarm_phase_lose[langID], language_alarm[langID]);
                     break;
 
                     default:
@@ -4275,23 +4276,23 @@ int smtp_post_alarm(int type, int subtype, int alarm_type, char *content)
                 switch(alarm_type) {
                     case WARNING_V_UP:
                     case WARNING_V_DOWN:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_V[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_V[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case WARNING_A_UP:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_A[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_A[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case WARNING_W_UP:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_W[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_W[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case WARNING_P_UP:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s %s", prod_id, language_alarm_P[langID], language_exceed[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s %s", prod_name, prod_id, language_alarm_P[langID], language_exceed[langID], language_alarm[langID]);
                     break;
 
                     case 0 ... 2:
-                    snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_alarm_phase_lose[langID], language_alarm[langID]);
+                    snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_alarm_phase_lose[langID], language_alarm[langID]);
                     break;
 
                     default:
@@ -4306,27 +4307,27 @@ int smtp_post_alarm(int type, int subtype, int alarm_type, char *content)
             switch(subtype) {
                 case SENSOR_TYPE_DoubleT:
                 case SENSOR_TYPE_TEMPERATURE:
-                snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_temperature[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_temperature[langID], language_alarm[langID]);
                 break;
 
                 case SENSOR_TYPE_SMOKE:
-                snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_sensor_smoke[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_sensor_smoke[langID], language_alarm[langID]);
                 break;
 
                 case SENSOR_TYPE_WATER:
-                snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_humidity[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_humidity[langID], language_alarm[langID]);
                 break;
 
                 case SENSOR_TYPE_DOOR:
-                snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_sensor_access[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_sensor_access[langID], language_alarm[langID]);
                 break;
 
                 case SENSOR_TYPE_GAS:
-                snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_atmosphere_gas[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_atmosphere_gas[langID], language_alarm[langID]);
                 break;
 
                 case SENSOR_TYPE_AIR_PRESS:
-                snprintf(temp, sizeof(temp), "PDU %d %s %s", prod_id, language_atmosphere_pressure[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_atmosphere_pressure[langID], language_alarm[langID]);
                 break;
 
                 default:
@@ -4337,7 +4338,7 @@ int smtp_post_alarm(int type, int subtype, int alarm_type, char *content)
 
         case ALARM_TYPE_NETWORK:
         {
-            snprintf(temp, sizeof(temp), "PDU %d %s", prod_id, language_alarm_Type_Network[langID]);
+            snprintf(temp, sizeof(temp), "%s %d %s", prod_name, prod_id, language_alarm_Type_Network[langID]);
         }
         break;