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

ip/src/appweb_handle.c

@@ -944,20 +944,27 @@ static void overallStatusMonitoring(void* conn)
             log_e("serach total System total err.");
         }
         int nSumChannel=0;
+        int nSumSensor = 0;
         GlobalPowerManger* _globalPowerMangerTemp = NULL ;
         list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManage._globalPowerManger.list, list)
         {
             nSumChannel+=1;
         }
         __system_total_info.channel_total = nSumChannel ;
-
+        
+        GlobalSensorManger * _g_manerger = NULL;
+        list_for_each_entry(_g_manerger, &__globalDeviceManage._globalSensorManger.list, list)
+        {
+            nSumSensor+=1;
+        }
 
         //获取通道总数
         // __GetSystemTotalInfo.channel_total = _globalDeviceManager->useSlaveCount;
         //获取系统总数情况
         _over_back_sts_info.system_total.channel_total  = __system_total_info.channel_total;
 		_over_back_sts_info.system_total.log_total      = __system_total_info.log_total;
-		_over_back_sts_info.system_total.sensor_total   = __system_total_info.sensor_total;
+
+		_over_back_sts_info.system_total.sensor_total   = nSumSensor;
 		_over_back_sts_info.system_total.warn_total     = __system_total_info.warn_total;
 
         //返回系统总数情况
@@ -3701,10 +3708,12 @@ static void serviceManagement(void *conn)
             log_e("time zone not contain GMT/UTC");
             return;
         }
-        char tempstr[10];
-        memcpy(tempstr, &p[strlen(key)], strlen(p) - strlen(key));
-        int value = atoi(tempstr);
-        if (value > 12 || value < -11)
+        p += strlen(key);
+        int value = atoi(p);
+        char tempstr[10] ={0};
+        // memcpy(tempstr, &p[strlen(key)], strlen(p) - strlen(key));
+        // int value = atoi(tempstr);
+        if (value > 12 || value < -12)
         {
             char buf[128];
             memset(buf, 0, sizeof(buf));

ip/src/common.c

@@ -279,7 +279,7 @@ void get_disk_occupy(char ** reused)
 
 static int set_rtc(time_t t)
 {
-    /*
+    
     int r=0,fd;
     struct rtc_time *rtc;
 
@@ -301,9 +301,9 @@ static int set_rtc(time_t t)
     close(fd);
     
     return r;
-    */
-    system("hwclock -w -f /dev/rtc0");
-    return 0;
+    
+    //system("hwclock -w -f /dev/rtc0");
+   // return 0;
     
 }