Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5

data/init/sys_menu.json

@@ -43,28 +43,6 @@
       "status": "0",
       "visible": "0"
     },
-    {
-      "id": 3,
-      "createBy": 1,
-      "createDept": 103,
-      
-      "updateBy": 1,
-      
-      "component": null,
-      "icon": "tool",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "系统工具",
-      "menuType": "M",
-      "orderNum": 24,
-      "parentId": 0,
-      "path": "tool",
-      "perms": "",
-      "queryParam": "",
-      "remark": "系统工具目录",
-      "status": "0",
-      "visible": "0"
-    },
     {
       "id": 4,
       "createBy": 1,
@@ -76,34 +54,14 @@
       "icon": "guide",
       "isCache": "0",
       "isFrame": "0",
-      "menuName": "PLUS官网",
+      "menuName": "铱塔官网",
       "menuType": "M",
       "orderNum": 25,
       "parentId": 0,
-      "path": "https://gitee.com/dromara/RuoYi-Vue-Plus",
+      "path": "http://iotkit-open-source.gitee.io/document",
       "perms": "",
       "queryParam": "",
-      "remark": "RuoYi-Vue-Plus官网地址",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 5,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": 1,
-      "component": null,
-      "icon": "star",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试菜单",
-      "menuType": "M",
-      "orderNum": 25,
-      "parentId": 0,
-      "path": "demo",
-      "perms": null,
-      "queryParam": null,
-      "remark": "",
+      "remark": "铱塔官网",
       "status": "0",
       "visible": "0"
     },
@@ -348,94 +306,6 @@
       "status": "0",
       "visible": "0"
     },
-    {
-      "id": 113,
-      "createBy": 1,
-      "createDept": 103,
-      
-      "updateBy": null,
-      "updateTime": null,
-      "component": "monitor/cache/index",
-      "icon": "redis",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "缓存监控",
-      "menuType": "C",
-      "orderNum": 5,
-      "parentId": 2,
-      "path": "cache",
-      "perms": "monitor:cache:list",
-      "queryParam": "",
-      "remark": "缓存监控菜单",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 114,
-      "createBy": 1,
-      "createDept": 103,
-      
-      "updateBy": null,
-      "updateTime": null,
-      "component": "tool/build/index",
-      "icon": "build",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "表单构建",
-      "menuType": "C",
-      "orderNum": 1,
-      "parentId": 3,
-      "path": "build",
-      "perms": "tool:build:list",
-      "queryParam": "",
-      "remark": "表单构建菜单",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 115,
-      "createBy": 1,
-      "createDept": 103,
-      
-      "updateBy": null,
-      "updateTime": null,
-      "component": "tool/gen/index",
-      "icon": "code",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "代码生成",
-      "menuType": "C",
-      "orderNum": 2,
-      "parentId": 3,
-      "path": "gen",
-      "perms": "tool:gen:list",
-      "queryParam": "",
-      "remark": "代码生成菜单",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 117,
-      "createBy": 1,
-      "createDept": 103,
-      
-      "updateBy": null,
-      "updateTime": null,
-      "component": "monitor/admin/index",
-      "icon": "dashboard",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "Admin监控",
-      "menuType": "C",
-      "orderNum": 5,
-      "parentId": 2,
-      "path": "Admin",
-      "perms": "monitor:admin:list",
-      "queryParam": "",
-      "remark": "Admin监控菜单",
-      "status": "0",
-      "visible": "0"
-    },
     {
       "id": 118,
       "createBy": 1,
@@ -458,28 +328,6 @@
       "status": "0",
       "visible": "0"
     },
-    {
-      "id": 120,
-      "createBy": 1,
-      "createDept": 103,
-      
-      "updateBy": null,
-      "updateTime": null,
-      "component": "monitor/xxljob/index",
-      "icon": "job",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "任务调度中心",
-      "menuType": "C",
-      "orderNum": 5,
-      "parentId": 2,
-      "path": "XxlJob",
-      "perms": "monitor:xxljob:list",
-      "queryParam": "",
-      "remark": "Xxl-Job控制台菜单",
-      "status": "0",
-      "visible": "0"
-    },
     {
       "id": 121,
       "createBy": 1,
@@ -1778,259 +1626,6 @@
       "status": "0",
       "visible": "0"
     },
-    {
-      "id": 1500,
-      "createBy": 1,
-      "createDept": 103,
-
-      "updateBy": null,
-      "updateTime": null,
-      "component": "demo/demo/index",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试单表",
-      "menuType": "C",
-      "orderNum": 1,
-      "parentId": 5,
-      "path": "demo",
-      "perms": "demo:demo:list",
-      "queryParam": null,
-      "remark": "测试单表菜单",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1501,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试单表查询",
-      "menuType": "F",
-      "orderNum": 1,
-      "parentId": 1500,
-      "path": "#",
-      "perms": "demo:demo:query",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1502,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试单表新增",
-      "menuType": "F",
-      "orderNum": 2,
-      "parentId": 1500,
-      "path": "#",
-      "perms": "demo:demo:add",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1503,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试单表修改",
-      "menuType": "F",
-      "orderNum": 3,
-      "parentId": 1500,
-      "path": "#",
-      "perms": "demo:demo:edit",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1504,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试单表删除",
-      "menuType": "F",
-      "orderNum": 4,
-      "parentId": 1500,
-      "path": "#",
-      "perms": "demo:demo:remove",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1505,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试单表导出",
-      "menuType": "F",
-      "orderNum": 5,
-      "parentId": 1500,
-      "path": "#",
-      "perms": "demo:demo:export",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1506,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "demo/tree/index",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试树表",
-      "menuType": "C",
-      "orderNum": 1,
-      "parentId": 5,
-      "path": "tree",
-      "perms": "demo:tree:list",
-      "queryParam": null,
-      "remark": "测试树表菜单",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1507,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试树表查询",
-      "menuType": "F",
-      "orderNum": 1,
-      "parentId": 1506,
-      "path": "#",
-      "perms": "demo:tree:query",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1508,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试树表新增",
-      "menuType": "F",
-      "orderNum": 2,
-      "parentId": 1506,
-      "path": "#",
-      "perms": "demo:tree:add",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1509,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试树表修改",
-      "menuType": "F",
-      "orderNum": 3,
-      "parentId": 1506,
-      "path": "#",
-      "perms": "demo:tree:edit",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1510,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试树表删除",
-      "menuType": "F",
-      "orderNum": 4,
-      "parentId": 1506,
-      "path": "#",
-      "perms": "demo:tree:remove",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 1511,
-      "createBy": 1,
-      "createDept": 103,
-      "updateBy": null,
-      "updateTime": null,
-      "component": "",
-      "icon": "#",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "测试树表导出",
-      "menuType": "F",
-      "orderNum": 5,
-      "parentId": 1506,
-      "path": "#",
-      "perms": "demo:tree:export",
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
     {
       "id": 1600,
       "createBy": 1,
@@ -2423,72 +2018,6 @@
       "status": "0",
       "visible": "0"
     },
-    {
-      "id": 2202,
-      "createBy": 1,
-      "createDept": 103,
-     
-      "updateBy": 1,
-     
-      "component": null,
-      "icon": "list",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "crud组件Demo",
-      "menuType": "M",
-      "orderNum": 1,
-      "parentId": 0,
-      "path": "/crudDemo",
-      "perms": null,
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 2203,
-      "createBy": 1,
-      "createDept": 103,
-    
-      "updateBy": 1,
-   
-      "component": "iot/crudDemo/disperseDemo",
-      "icon": "build",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "拆分组件demo",
-      "menuType": "C",
-      "orderNum": 1,
-      "parentId": 2202,
-      "path": "disperseDemo",
-      "perms": null,
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
-    {
-      "id": 2204,
-      "createBy": 1,
-      "createDept": 103,
-    
-      "updateBy": 1,
-   
-      "component": "iot/crudDemo/crudDemo",
-      "icon": "cascader",
-      "isCache": "0",
-      "isFrame": "1",
-      "menuName": "crud组合组件",
-      "menuType": "C",
-      "orderNum": 2,
-      "parentId": 1660167072208510978,
-      "path": "crudDemo",
-      "perms": null,
-      "queryParam": null,
-      "remark": "",
-      "status": "0",
-      "visible": "0"
-    },
     {
       "id": 2205,
       "createBy": 1,
@@ -2585,7 +2114,7 @@
       "updateBy": 1,
    
       "component": "iot/communication/convertors/index",
-      "icon": "",
+      "icon": "component",
       "isCache": "1",
       "isFrame": "1",
       "menuName": "设备消息转换器",
@@ -2607,7 +2136,7 @@
       "updateBy": 1,
    
       "component": "iot/communication/components/index",
-      "icon": "",
+      "icon": "component",
       "isCache": "1",
       "isFrame": "1",
       "menuName": "通讯组件管理",
@@ -2651,7 +2180,7 @@
       "updateBy": 1,
    
       "component": "iot/ruleEngine/ruleSys/index",
-      "icon": "",
+      "icon": "component",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "规则管理",
@@ -2673,7 +2202,7 @@
       "updateBy": 1,
    
       "component": "iot/ruleEngine/scheduledTask/index",
-      "icon": "",
+      "icon": "component",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "定时任务",
@@ -2759,7 +2288,7 @@
       "updateBy": 1,
 
       "component": "iot/messageCenter/list",
-      "icon": "",
+      "icon": "message",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "消息列表",
@@ -2803,7 +2332,7 @@
       "updateBy": 1,
 
       "component": "iot/channel/config",
-      "icon": "",
+      "icon": "system",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "通道配置",
@@ -2825,7 +2354,7 @@
       "updateBy": 1,
     
       "component": "iot/channel/template",
-      "icon": "",
+      "icon": "system",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "模板配置",
@@ -2869,7 +2398,7 @@
       "updateBy": 1,
    
       "component": "iot/alarm/list",
-      "icon": "",
+      "icon": "message",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "告警列表",
@@ -2891,7 +2420,7 @@
       "updateBy": 1,
 
       "component": "iot/alarm/config",
-      "icon": "",
+      "icon": "system",
       "isCache": "0",
       "isFrame": "1",
       "menuName": "告警配置",

data/init/sys_role_menu.json

@@ -1,296 +1,402 @@
  [
+
     {
-      "id": 429162174689349,
+      "id": 429541652308037,
       "menu_id": 1,
       "role_id": 2
     },
     {
-      "id": 429162174689350,
+      "id": 429541652308038,
       "menu_id": 100,
       "role_id": 2
     },
     {
-      "id": 429162174689351,
-      "menu_id": 1001,
+      "id": 429541652308039,
+      "menu_id": 101,
       "role_id": 2
     },
     {
-      "id": 429162174689352,
-      "menu_id": 1002,
+      "id": 429541652308040,
+      "menu_id": 102,
       "role_id": 2
     },
     {
-      "id": 429162174689353,
-      "menu_id": 101,
+      "id": 429541652308041,
+      "menu_id": 103,
       "role_id": 2
     },
     {
-      "id": 429162174689354,
-      "menu_id": 1008,
+      "id": 429541652308042,
+      "menu_id": 104,
       "role_id": 2
     },
     {
-      "id": 429162174689355,
-      "menu_id": 1009,
+      "id": 429541652308043,
+      "menu_id": 105,
       "role_id": 2
     },
     {
-      "id": 429162174689356,
-      "menu_id": 1010,
+      "id": 429541652308044,
+      "menu_id": 106,
       "role_id": 2
     },
     {
-      "id": 429162174689357,
-      "menu_id": 102,
+      "id": 429541652308045,
+      "menu_id": 107,
       "role_id": 2
     },
     {
-      "id": 429162174689358,
-      "menu_id": 1013,
+      "id": 429541652308046,
+      "menu_id": 108,
       "role_id": 2
     },
     {
-      "id": 429162174689359,
-      "menu_id": 1014,
+      "id": 429541652308047,
+      "menu_id": 500,
       "role_id": 2
     },
     {
-      "id": 429162174689360,
-      "menu_id": 103,
+      "id": 429541652308048,
+      "menu_id": 501,
       "role_id": 2
     },
     {
-      "id": 429162174689361,
-      "menu_id": 1017,
+      "id": 429541652308049,
+      "menu_id": 1001,
       "role_id": 2
     },
     {
-      "id": 429162174689362,
-      "menu_id": 1018,
+      "id": 429541652308050,
+      "menu_id": 1002,
       "role_id": 2
     },
     {
-      "id": 429162174689363,
-      "menu_id": 104,
+      "id": 429541652308051,
+      "menu_id": 1005,
       "role_id": 2
     },
     {
-      "id": 429162174689364,
-      "menu_id": 1021,
+      "id": 429541652312133,
+      "menu_id": 1008,
       "role_id": 2
     },
     {
-      "id": 429162174689365,
-      "menu_id": 1022,
+      "id": 429541652312134,
+      "menu_id": 1009,
       "role_id": 2
     },
     {
-      "id": 429162174689366,
-      "menu_id": 1023,
+      "id": 429541652312135,
+      "menu_id": 1013,
       "role_id": 2
     },
     {
-      "id": 429162174689367,
-      "menu_id": 105,
+      "id": 429541652312136,
+      "menu_id": 1014,
       "role_id": 2
     },
     {
-      "id": 429162174689368,
-      "menu_id": 1026,
+      "id": 429541652312137,
+      "menu_id": 1017,
       "role_id": 2
     },
     {
-      "id": 429162174689369,
-      "menu_id": 1027,
+      "id": 429541652312138,
+      "menu_id": 1018,
       "role_id": 2
     },
     {
-      "id": 429162174689370,
-      "menu_id": 1030,
+      "id": 429541652312139,
+      "menu_id": 1021,
       "role_id": 2
     },
     {
-      "id": 429162174689371,
-      "menu_id": 106,
+      "id": 429541652312140,
+      "menu_id": 1022,
       "role_id": 2
     },
     {
-      "id": 429162174689372,
-      "menu_id": 1031,
+      "id": 429541652312141,
+      "menu_id": 1023,
       "role_id": 2
     },
     {
-      "id": 429162174689373,
-      "menu_id": 1032,
+      "id": 429541652312142,
+      "menu_id": 1026,
       "role_id": 2
     },
     {
-      "id": 429162174689374,
-      "menu_id": 1033,
+      "id": 429541652312143,
+      "menu_id": 1027,
       "role_id": 2
     },
     {
-      "id": 429162174689375,
-      "menu_id": 107,
+      "id": 429541652312144,
+      "menu_id": 1031,
       "role_id": 2
     },
     {
-      "id": 429162174689376,
+      "id": 429541652312145,
+      "menu_id": 1032,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312146,
+      "menu_id": 1035,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312147,
       "menu_id": 1036,
       "role_id": 2
     },
     {
-      "id": 429162174689377,
+      "id": 429541652312148,
       "menu_id": 1037,
       "role_id": 2
     },
     {
-      "id": 429162174689378,
-      "menu_id": 108,
+      "id": 429541652312149,
+      "menu_id": 1040,
       "role_id": 2
     },
     {
-      "id": 429162174689379,
-      "menu_id": 500,
+      "id": 429541652312150,
+      "menu_id": 1042,
       "role_id": 2
     },
     {
-      "id": 429162174689380,
-      "menu_id": 1040,
+      "id": 429541652312151,
+      "menu_id": 1043,
       "role_id": 2
     },
     {
-      "id": 429162174689381,
-      "menu_id": 1041,
+      "id": 429541652312152,
+      "menu_id": 1045,
       "role_id": 2
     },
     {
-      "id": 429162174689382,
-      "menu_id": 1042,
+      "id": 429541652312153,
+      "menu_id": 118,
       "role_id": 2
     },
     {
-      "id": 429162174693445,
-      "menu_id": 501,
+      "id": 429541652312154,
+      "menu_id": 1600,
       "role_id": 2
     },
     {
-      "id": 429162174693446,
-      "menu_id": 1043,
+      "id": 429541652312155,
+      "menu_id": 1601,
       "role_id": 2
     },
     {
-      "id": 429162174693447,
-      "menu_id": 1044,
+      "id": 429541652312156,
+      "menu_id": 1602,
       "role_id": 2
     },
     {
-      "id": 429162174693448,
-      "menu_id": 1045,
+      "id": 429541652312157,
+      "menu_id": 1603,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312158,
+      "menu_id": 1604,
       "role_id": 2
     },
     {
-      "id": 429162174693449,
-      "menu_id": 1050,
+      "id": 429541652312159,
+      "menu_id": 1605,
       "role_id": 2
     },
     {
-      "id": 429162174693450,
+      "id": 429541652312160,
       "menu_id": 2200,
       "role_id": 2
     },
     {
-      "id": 429162174693451,
+      "id": 429541652312161,
+      "menu_id": 2201,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312162,
+      "menu_id": 2214,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312163,
+      "menu_id": 2205,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312164,
+      "menu_id": 2206,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312165,
+      "menu_id": 2207,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312166,
+      "menu_id": 2215,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312167,
       "menu_id": 2208,
       "role_id": 2
     },
     {
-      "id": 429162174693452,
+      "id": 429541652312168,
+      "menu_id": 2209,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312169,
+      "menu_id": 2210,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312170,
       "menu_id": 2211,
       "role_id": 2
     },
     {
-      "id": 429162174693453,
+      "id": 429541652312171,
+      "menu_id": 2212,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312172,
+      "menu_id": 2213,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312173,
       "menu_id": 2216,
       "role_id": 2
     },
     {
-      "id": 429162174693454,
+      "id": 429541652312174,
+      "menu_id": 2217,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312175,
       "menu_id": 2218,
       "role_id": 2
     },
     {
-      "id": 429162174693455,
+      "id": 429541652312176,
+      "menu_id": 2219,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312177,
+      "menu_id": 2220,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312178,
       "menu_id": 2221,
       "role_id": 2
     },
     {
-      "id": 429162174693456,
+      "id": 429541652312179,
+      "menu_id": 2222,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312180,
+      "menu_id": 2223,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312181,
+      "menu_id": 2,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312182,
       "menu_id": 109,
       "role_id": 2
     },
     {
-      "id": 429162174693457,
+      "id": 429541652312183,
       "menu_id": 1046,
       "role_id": 2
     },
     {
-      "id": 429162174693458,
+      "id": 429541652312184,
       "menu_id": 1047,
       "role_id": 2
     },
     {
-      "id": 429162174693459,
+      "id": 429541652312185,
       "menu_id": 1048,
       "role_id": 2
     },
     {
-      "id": 429162174693460,
+      "id": 429541652312186,
       "menu_id": 113,
       "role_id": 2
     },
     {
-      "id": 429162174693461,
+      "id": 429541652312187,
+      "menu_id": 117,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312188,
+      "menu_id": 120,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312189,
       "menu_id": 3,
       "role_id": 2
     },
     {
-      "id": 429162174693462,
+      "id": 429541652312190,
       "menu_id": 114,
       "role_id": 2
     },
     {
-      "id": 429162174693463,
+      "id": 429541652312191,
       "menu_id": 115,
       "role_id": 2
     },
     {
-      "id": 429162174693464,
+      "id": 429541652316229,
       "menu_id": 1055,
       "role_id": 2
     },
     {
-      "id": 429162174693465,
+      "id": 429541652316230,
       "menu_id": 1056,
       "role_id": 2
     },
     {
-      "id": 429162174693466,
+      "id": 429541652316231,
       "menu_id": 1058,
       "role_id": 2
     },
     {
-      "id": 429162174693467,
+      "id": 429541652316232,
       "menu_id": 1057,
       "role_id": 2
     },
     {
-      "id": 429162174693468,
+      "id": 429541652316233,
       "menu_id": 1059,
       "role_id": 2
     },
     {
-      "id": 429162174693469,
+      "id": 429541652316234,
       "menu_id": 1060,
       "role_id": 2
     }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/thingmodel/ThingModelVo.java

@@ -1,11 +1,7 @@
 package cc.iotkit.manager.dto.vo.thingmodel;
 
 import cc.iotkit.model.product.ThingModel;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
-import io.github.linpeilie.annotations.AutoMapping;
-import io.github.linpeilie.annotations.ReverseAutoMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,23 +11,17 @@ import java.io.Serializable;
 
 @ApiModel(value = "ThingModelVo")
 @Data
-@ExcelIgnoreUnannotated
 @AutoMapper(target = ThingModel.class)
 public class ThingModelVo implements Serializable {
-
     private static final long serialVersionUID = -1L;
 
     @ApiModelProperty(value = "主键")
-    @ExcelProperty(value = "主键")
     private String id;
 
     @ApiModelProperty(value = "模型内容")
-    @ExcelProperty(value = "模型内容")
     private ThingModel.Model model;
 
     @ApiModelProperty(value = "产品key")
-    @ExcelProperty(value = "产品key")
     private String productKey;
 
-
 }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/DeviceServiceImpl.java

@@ -167,7 +167,7 @@ public class DeviceServiceImpl implements IDeviceService {
     @Override
     public DeviceInfo getDetail(String deviceId) {
         DeviceInfo deviceInfo = deviceInfoData.findByDeviceId(deviceId);
-        dataOwnerService.checkOwner(deviceInfo);
+//        dataOwnerService.checkOwner(deviceInfo);
         deviceInfo.setProperty(deviceInfoData.getProperties(deviceId));
         return deviceInfo;
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserOnlineController.java

@@ -37,7 +37,6 @@ public class SysUserOnlineController extends BaseController {
 
     /**
      * 获取在线用户监控列表
-     *
      */
     @ApiOperation("获取在线用户监控列表")
     @SaCheckPermission("monitor:online:list")
@@ -74,12 +73,11 @@ public class SysUserOnlineController extends BaseController {
         Collections.reverse(userOnlineDTOList);
         userOnlineDTOList.removeAll(Collections.singleton(null));
         List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
-        return null;
+        return new Paging<>(userOnlineList.size(), userOnlineList);
     }
 
     /**
      * 强退用户
-     *
      */
     @ApiOperation("强退用户")
     @SaCheckPermission("monitor:online:forceLogout")