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

pro/src/app.c

@@ -401,6 +401,7 @@ void* power_thread(void* arg)
                             _globalPowerInfo._power_info.status=0;
                         }
                         __globalDeviceManage.triphasic_mmap->pw_o_chn[_chn].chn[k].o_status = _globalPowerInfo._power_info.status;
+                        k=k+1;
                         time_t now;
                         time(&now);
                         t = localtime(&now);

pro/src/appweb_handle.c

@@ -3391,7 +3391,7 @@ static void systemManagent(void *conn)
             struct timeval tv;
             gettimeofday(&tv, NULL);
             t = localtime(&tv.tv_sec);
-            sprintf(new_user->createTime, "%04d-%02d-%02d %02d:%02d:%02d", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, 23, 59, 59);
+            sprintf(new_user->createTime, "%04d-%02d-%02d %02d:%02d:%02d", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour,  t->tm_min, t->tm_sec);
 
             dev_insert_user_info(__globalDeviceManage.db, new_user);
         }

pro/src/cascade.c

@@ -589,7 +589,7 @@ static int mb_receive(cascade_handle_t *cas)
                 cascade_slave_write(h.reg, h.regcnt);
             }
 
-            r = _mb_reply(cas, buff, rc, cas->map);
+            r = _mb_reply(cas, buff, rc,cascade_slave_map());
         }
     }
 

pro/src/cascade.h

@@ -205,6 +205,7 @@ int cascade_lock(void);
 int cascade_unlock(void);
 
 int cascade_slave_init(void);
+modbus_mapping_t    *cascade_slave_map();
 void cascade_slave_read(uint32_t addr,uint32_t lenth);
 void cascade_slave_write(uint32_t addr, uint16_t val);
 

pro/src/cascade_slave.c

@@ -123,6 +123,12 @@ typedef struct {
 
 static slave_handle_t slHandle;
 
+
+modbus_mapping_t    *cascade_slave_map()
+{
+    return slHandle.map;
+}
+
 int cascade_slave_init(void)
 {
     slave_handle_t *sh=&slHandle;

pro/src/json_handle.c

@@ -4251,11 +4251,13 @@ int GetRoleLevelByID(int _RoleID,RoleInfo* __RoleInfo_t)
 
 char* GetRoleNameByID(int _RoleID,RoleInfo* __RoleInfo_t)
 {
-    char* nname = "";
-    if ( __RoleInfo_t==NULL)
+    char* nname=NULL;
+
+    if (__RoleInfo_t == NULL)
     {
        return nname;
     }
+
     RoleInfo *_RoleInfoTemp = NULL;
     list_for_each_entry(_RoleInfoTemp, &__RoleInfo_t->list, list)
     {
@@ -4263,7 +4265,23 @@ char* GetRoleNameByID(int _RoleID,RoleInfo* __RoleInfo_t)
             break;
         if (_RoleInfoTemp->roleID == _RoleID)
         {
-            nname = _RoleInfoTemp->roleName;
+           // nname = _RoleInfoTemp->roleName;
+           nname = malloc(64);
+           if (nname != NULL)
+           {
+               if (_RoleID == 1)
+               {
+                   strcpy(nname, language_Role_Super_Admin[__globalDeviceManage._global_device_info->product_language]);
+               }
+               else if (_RoleID == 2)
+               {
+                   strcpy(nname, language_Role_Admin[__globalDeviceManage._global_device_info->product_language]);
+               }
+               else if (_RoleID == 3)
+               {
+                   strcpy(nname, language_Role_User[__globalDeviceManage._global_device_info->product_language]);
+               }
+           }
             break;
         }
     }
@@ -4349,8 +4367,15 @@ char* service_userQuery_ack_to_json(char* _userName,UserInfo* __UserInfo_t,RoleI
         memset(buffer, 0, sizeof(buffer));
         sprintf(buffer, "%d",_UserInfoTemp1->roleID);
         cJSON_AddStringToObject(data_filed, "roleId", buffer);
-        cJSON_AddStringToObject(data_filed, "roleName", GetRoleNameByID(_UserInfoTemp1->roleID,__RoleInfo_t));
 
+        char* nroleName=GetRoleNameByID(_UserInfoTemp1->roleID,__RoleInfo_t);
+        if (nroleName!=NULL)
+        {
+           cJSON_AddStringToObject(data_filed, "roleName", nroleName);
+           free(nroleName);
+        }
+        else  cJSON_AddStringToObject(data_filed, "roleName", "");
+        
         cJSON_AddItemToObject(data_root_array, "rows", data_filed);
     }
 
@@ -4416,7 +4441,19 @@ char* service_userRole_ack_to_json(char* _userName,UserInfo* __UserInfo_t,RoleIn
         memset(buffer, 0, sizeof(buffer));
         sprintf(buffer, "%d",_RoleInfoTemp1->roleID);
         cJSON_AddStringToObject(data_filed, "roleId", buffer);
-        cJSON_AddStringToObject(data_filed,"roleName",_RoleInfoTemp1->roleName);
+        if (_RoleInfoTemp1->roleID==1)
+        {
+             cJSON_AddStringToObject(data_filed,"roleName",language_Role_Super_Admin[__globalDeviceManage._global_device_info->product_language]);
+        }
+        else if (_RoleInfoTemp1->roleID==2)
+        {
+             cJSON_AddStringToObject(data_filed,"roleName",language_Role_Admin[__globalDeviceManage._global_device_info->product_language]);
+        }
+        else
+        {
+            cJSON_AddStringToObject(data_filed,"roleName",language_Role_User[__globalDeviceManage._global_device_info->product_language]);
+        }
+        //cJSON_AddStringToObject(data_filed,"roleName",_RoleInfoTemp1->roleName);
 
         cJSON_AddItemToObject(data_root_array, "roles", data_filed);
     }

pro/src/language_common.c

@@ -492,4 +492,28 @@ const char language_alarm_RS485_slave[LANGUAGE_TYPE][LANGUAGE_SIZE] =
     " Slave",
     "Вспомогательный",
     " "
+} ;
+
+const char language_Role_Super_Admin[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "超级管理员",
+    " Super Admin",
+    "Суперадминистратор",
+    " "
+} ;
+
+const char language_Role_Admin[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "管理员",
+    " Admin",
+    "Администратор",
+    " "
+} ;
+
+const char language_Role_User[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "用户",
+    " User",
+    "Пользователи",
+    " "
 } ;

pro/src/language_common.h

@@ -127,4 +127,10 @@ extern const char language_alarm_RS485_master[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
 extern const char language_alarm_RS485_slave[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
+extern const char language_Role_Super_Admin[LANGUAGE_TYPE][LANGUAGE_SIZE];
+
+extern const char language_Role_Admin[LANGUAGE_TYPE][LANGUAGE_SIZE];
+
+extern const char language_Role_User[LANGUAGE_TYPE][LANGUAGE_SIZE];
+
 #endif