|
@@ -2319,6 +2319,7 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
{
|
|
{
|
|
|
log_d("start delete handle.");
|
|
log_d("start delete handle.");
|
|
|
int sensor_id_temp = _over_all_sensor_request.sensorId;
|
|
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)
|
|
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)
|
|
if (node->sensor_id == sensor_id_temp)
|
|
|
{
|
|
{
|
|
|
|
|
+ strcpy(sensorName,node->sensor_name);
|
|
|
list_del(&node->list);
|
|
list_del(&node->list);
|
|
|
free(node);
|
|
free(node);
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
lock_s_release(LOCK_ID_SENSOR);
|
|
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();
|
|
ack_str = ctrl_sts_ack_to_json();
|
|
|
}
|
|
}
|
|
@@ -2368,7 +2369,6 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
}
|
|
}
|
|
|
if (node)
|
|
if (node)
|
|
|
{
|
|
{
|
|
|
-#if (1)
|
|
|
|
|
GlobalSensorManger *_globalSensorMangerTemp = node;
|
|
GlobalSensorManger *_globalSensorMangerTemp = node;
|
|
|
// 填充数据
|
|
// 填充数据
|
|
|
_globalSensorMangerTemp->sensor_type = strtol(_over_all_sensor_request.sensorType, NULL, 10);
|
|
_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.");
|
|
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();
|
|
ack_str = ctrl_sts_ack_to_json();
|
|
|
}
|
|
}
|
|
|
//添加传感器
|
|
//添加传感器
|
|
@@ -2666,7 +2667,7 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
|
|
|
|
|
char temp[100];
|
|
char temp[100];
|
|
|
//sprintf(temp,"$新增$|$传感器$|%d",_over_all_sensor_request.sensorId);
|
|
//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);
|
|
dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
@@ -5268,37 +5269,37 @@ static void systemManagent(void *conn)
|
|
|
//删除用户
|
|
//删除用户
|
|
|
else if(strcmp(_UserRoleManageRequestInfo.type,"deleteUser")==0)
|
|
else if(strcmp(_UserRoleManageRequestInfo.type,"deleteUser")==0)
|
|
|
{
|
|
{
|
|
|
- bool CurUserFlag=false;
|
|
|
|
|
|
|
+ bool CurUserFlag = false;
|
|
|
char *nName = getUserNamebyToken(_UserRoleManageRequestInfo.user_token);
|
|
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)
|
|
if (!CurUserFlag)
|
|
|
{
|
|
{
|
|
|
// char *pUserlist;
|
|
// char *pUserlist;
|
|
@@ -5313,7 +5314,8 @@ static void systemManagent(void *conn)
|
|
|
|
|
|
|
|
char temp[100];
|
|
char temp[100];
|
|
|
// sprintf(temp, "$删除$|$用户$|%d", _UserRoleManageRequestInfo.userIds);
|
|
// 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);
|
|
dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
|
|
|
ack_str = ctrl_sts_ack_to_json();
|
|
ack_str = ctrl_sts_ack_to_json();
|
|
|
}
|
|
}
|