Просмотр исходного кода

1、修复部分传感器、用户名操作报警信息错误;2、修复消息队列线程创建栈大小设置错误。

liyuezong 1 год назад
Родитель
Сommit
f7e7fe036d
2 измененных файлов с 40 добавлено и 37 удалено
  1. 39 37
      pro/src/appweb_handle.c
  2. 1 0
      pro/src/thread.c

+ 39 - 37
pro/src/appweb_handle.c

@@ -2319,6 +2319,7 @@ static void sensorStatusMonitoring(void* conn)
     {
         log_d("start delete handle.");
         int sensor_id_temp = _over_all_sensor_request.sensorId;
+        char sensorName[64];
         
         if(dev_delete_sensor_manage(__globalDeviceManage.db,  __globalDeviceManage._globalDevInfo.product.id,sensor_id_temp)!=0)
         {
@@ -2335,19 +2336,19 @@ static void sensorStatusMonitoring(void* conn)
             {
                 if (node->sensor_id == sensor_id_temp)
                 {
+                    strcpy(sensorName,node->sensor_name);
                     list_del(&node->list);
                     free(node);
                     break;
                 }
             }
             lock_s_release(LOCK_ID_SENSOR);
-        }
-
 
-        char temp[100];
-        //sprintf(temp,"$删除$|$传感器$|%d",sensor_id_temp);
-        sprintf(temp,"Delete sensor %d",sensor_id_temp);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
+            char temp[100];
+            // sprintf(temp,"$删除$|$传感器$|%d",sensor_id_temp);
+            sprintf(temp, "Delete sensor %s", sensorName);
+            dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
+        }
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -2368,7 +2369,6 @@ static void sensorStatusMonitoring(void* conn)
         }
         if (node)
         {
-#if (1)
             GlobalSensorManger *_globalSensorMangerTemp = node;
             // 填充数据
             _globalSensorMangerTemp->sensor_type = strtol(_over_all_sensor_request.sensorType, NULL, 10);
@@ -2481,14 +2481,15 @@ static void sensorStatusMonitoring(void* conn)
             {
                 log_e("dev update error.");
             }
-#endif
+            else
+            {
+                char temp[100];
+                // sprintf(temp,"$修改$|$传感器$|%d",sensor_id_temp);
+                sprintf(temp, "Update sensor %s", _globalSensorMangerTemp->sensor_name);
+                dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
+            }
         }
 
-        char temp[100];
-       // sprintf(temp,"$修改$|$传感器$|%d",sensor_id_temp);
-        sprintf(temp,"Update sensor %d",sensor_id_temp);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
-
         ack_str = ctrl_sts_ack_to_json();
     }
     //添加传感器
@@ -2666,7 +2667,7 @@ static void sensorStatusMonitoring(void* conn)
 
             char temp[100];
             //sprintf(temp,"$新增$|$传感器$|%d",_over_all_sensor_request.sensorId);
-            sprintf(temp,"Add sensor %d",_over_all_sensor_request.sensorId);
+            sprintf(temp,"Add sensor %s",_globalSensorMangerTemp->sensor_name);
             dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
         }
         else {
@@ -5268,37 +5269,37 @@ static void systemManagent(void *conn)
     //删除用户
     else if(strcmp(_UserRoleManageRequestInfo.type,"deleteUser")==0)
     {
-        bool CurUserFlag=false;
+        bool CurUserFlag = false;
         char *nName = getUserNamebyToken(_UserRoleManageRequestInfo.user_token);
-        if (nName != NULL)
-        {
-            UserInfo User_list;
-            INIT_LIST_HEAD(&User_list.list);
+        char ndelName [32];
+
+        UserInfo User_list;
+        INIT_LIST_HEAD(&User_list.list);
 
-            if (0 == dev_get_user_info(__globalDeviceManage.db, &User_list))
+        if (0 == dev_get_user_info(__globalDeviceManage.db, &User_list))
+        {
+            UserInfo *_UserInfoTemp = NULL;
+            list_for_each_entry(_UserInfoTemp, &User_list.list, list)
             {
-                UserInfo *_UserInfoTemp = NULL;
-                list_for_each_entry(_UserInfoTemp, &User_list.list, list)
+                if (_UserRoleManageRequestInfo.userIds == _UserInfoTemp->userID)
                 {
-                    if (strcmp(_UserInfoTemp->userName, nName) == 0)
+                    if (nName != NULL && strcmp(_UserInfoTemp->userName, nName) == 0)
                     {
-                        if (_UserRoleManageRequestInfo.userIds == _UserInfoTemp->userID)
-                        {
-                            CurUserFlag = true;
-                            break;
-                        }
-                        break;
+                        CurUserFlag = true;
                     }
+                    strcpy(ndelName,_UserInfoTemp->userName) ;
+                    break;
                 }
             }
-            UserInfo *node;
-            UserInfo *next;
-            list_for_each_entry_safe(node, next, &User_list.list, list)
-            {
-                list_del(&node->list);
-                free(node);
-            }
         }
+        UserInfo *node;
+        UserInfo *next;
+        list_for_each_entry_safe(node, next, &User_list.list, list)
+        {
+            list_del(&node->list);
+            free(node);
+        }
+
         if (!CurUserFlag)
         {
             // char *pUserlist;
@@ -5313,7 +5314,8 @@ static void systemManagent(void *conn)
 
             char temp[100];
             // sprintf(temp, "$删除$|$用户$|%d", _UserRoleManageRequestInfo.userIds);
-            sprintf(temp, "Delete user %d", _UserRoleManageRequestInfo.userIds);
+
+            sprintf(temp, "Delete user %s", ndelName);
             dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
             ack_str = ctrl_sts_ack_to_json();
         }

+ 1 - 0
pro/src/thread.c

@@ -29,6 +29,7 @@ static thread_attr_t thdAttrs[THREAD_ID_MAX]={
     {"board",       NULL,           NULL,           STACK_SZ,       1},
     {"ui",          NULL,           NULL,           STACK_SZ,       1},
     {"Cellular",    NULL,           NULL,           STACK_SZ,       1},
+    {"RECV_MESSAGE_QUEUE",    NULL,           NULL,           STACK_SZ,       1},
 };
 static thread_handle_t thdHandles[THREAD_ID_MAX]={0};