diff --git a/springboot/sql/update/sys_role_menu.sql b/springboot/sql/update/sys_role_menu.sql
new file mode 100644
index 00000000..88f83646
--- /dev/null
+++ b/springboot/sql/update/sys_role_menu.sql
@@ -0,0 +1,304 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 阿里云
+ Source Server Type    : MySQL
+ Source Server Version : 50726
+ Source Host           : 114.55.33.198:3306
+ Source Schema         : wumei-smart
+
+ Target Server Type    : MySQL
+ Target Server Version : 50726
+ File Encoding         : 65001
+
+ Date: 14/04/2022 23:28:40
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sys_role_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_menu`;
+CREATE TABLE `sys_role_menu`  (
+  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
+  `menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
+  PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_role_menu
+-- ----------------------------
+INSERT INTO `sys_role_menu` VALUES (2, 108);
+INSERT INTO `sys_role_menu` VALUES (2, 112);
+INSERT INTO `sys_role_menu` VALUES (2, 2000);
+INSERT INTO `sys_role_menu` VALUES (2, 2001);
+INSERT INTO `sys_role_menu` VALUES (2, 2002);
+INSERT INTO `sys_role_menu` VALUES (2, 2003);
+INSERT INTO `sys_role_menu` VALUES (2, 2004);
+INSERT INTO `sys_role_menu` VALUES (2, 2005);
+INSERT INTO `sys_role_menu` VALUES (2, 2006);
+INSERT INTO `sys_role_menu` VALUES (2, 2007);
+INSERT INTO `sys_role_menu` VALUES (2, 2008);
+INSERT INTO `sys_role_menu` VALUES (2, 2009);
+INSERT INTO `sys_role_menu` VALUES (2, 2010);
+INSERT INTO `sys_role_menu` VALUES (2, 2011);
+INSERT INTO `sys_role_menu` VALUES (2, 2012);
+INSERT INTO `sys_role_menu` VALUES (2, 2013);
+INSERT INTO `sys_role_menu` VALUES (2, 2014);
+INSERT INTO `sys_role_menu` VALUES (2, 2015);
+INSERT INTO `sys_role_menu` VALUES (2, 2016);
+INSERT INTO `sys_role_menu` VALUES (2, 2017);
+INSERT INTO `sys_role_menu` VALUES (2, 2018);
+INSERT INTO `sys_role_menu` VALUES (2, 2019);
+INSERT INTO `sys_role_menu` VALUES (2, 2020);
+INSERT INTO `sys_role_menu` VALUES (2, 2021);
+INSERT INTO `sys_role_menu` VALUES (2, 2022);
+INSERT INTO `sys_role_menu` VALUES (2, 2023);
+INSERT INTO `sys_role_menu` VALUES (2, 2024);
+INSERT INTO `sys_role_menu` VALUES (2, 2031);
+INSERT INTO `sys_role_menu` VALUES (2, 2032);
+INSERT INTO `sys_role_menu` VALUES (2, 2033);
+INSERT INTO `sys_role_menu` VALUES (2, 2034);
+INSERT INTO `sys_role_menu` VALUES (2, 2035);
+INSERT INTO `sys_role_menu` VALUES (2, 2036);
+INSERT INTO `sys_role_menu` VALUES (2, 2043);
+INSERT INTO `sys_role_menu` VALUES (2, 2044);
+INSERT INTO `sys_role_menu` VALUES (2, 2045);
+INSERT INTO `sys_role_menu` VALUES (2, 2046);
+INSERT INTO `sys_role_menu` VALUES (2, 2047);
+INSERT INTO `sys_role_menu` VALUES (2, 2048);
+INSERT INTO `sys_role_menu` VALUES (2, 2049);
+INSERT INTO `sys_role_menu` VALUES (2, 2050);
+INSERT INTO `sys_role_menu` VALUES (2, 2051);
+INSERT INTO `sys_role_menu` VALUES (2, 2052);
+INSERT INTO `sys_role_menu` VALUES (2, 2053);
+INSERT INTO `sys_role_menu` VALUES (2, 2054);
+INSERT INTO `sys_role_menu` VALUES (2, 2067);
+INSERT INTO `sys_role_menu` VALUES (2, 2068);
+INSERT INTO `sys_role_menu` VALUES (2, 2069);
+INSERT INTO `sys_role_menu` VALUES (2, 2070);
+INSERT INTO `sys_role_menu` VALUES (2, 2071);
+INSERT INTO `sys_role_menu` VALUES (2, 2072);
+INSERT INTO `sys_role_menu` VALUES (2, 2085);
+INSERT INTO `sys_role_menu` VALUES (2, 2086);
+INSERT INTO `sys_role_menu` VALUES (2, 2087);
+INSERT INTO `sys_role_menu` VALUES (2, 2088);
+INSERT INTO `sys_role_menu` VALUES (2, 2089);
+INSERT INTO `sys_role_menu` VALUES (2, 2090);
+INSERT INTO `sys_role_menu` VALUES (3, 108);
+INSERT INTO `sys_role_menu` VALUES (3, 112);
+INSERT INTO `sys_role_menu` VALUES (3, 2000);
+INSERT INTO `sys_role_menu` VALUES (3, 2002);
+INSERT INTO `sys_role_menu` VALUES (3, 2007);
+INSERT INTO `sys_role_menu` VALUES (3, 2008);
+INSERT INTO `sys_role_menu` VALUES (3, 2009);
+INSERT INTO `sys_role_menu` VALUES (3, 2010);
+INSERT INTO `sys_role_menu` VALUES (3, 2011);
+INSERT INTO `sys_role_menu` VALUES (3, 2012);
+INSERT INTO `sys_role_menu` VALUES (3, 2019);
+INSERT INTO `sys_role_menu` VALUES (3, 2020);
+INSERT INTO `sys_role_menu` VALUES (3, 2021);
+INSERT INTO `sys_role_menu` VALUES (3, 2022);
+INSERT INTO `sys_role_menu` VALUES (3, 2023);
+INSERT INTO `sys_role_menu` VALUES (3, 2024);
+INSERT INTO `sys_role_menu` VALUES (3, 2031);
+INSERT INTO `sys_role_menu` VALUES (3, 2032);
+INSERT INTO `sys_role_menu` VALUES (3, 2033);
+INSERT INTO `sys_role_menu` VALUES (3, 2034);
+INSERT INTO `sys_role_menu` VALUES (3, 2035);
+INSERT INTO `sys_role_menu` VALUES (3, 2036);
+INSERT INTO `sys_role_menu` VALUES (3, 2043);
+INSERT INTO `sys_role_menu` VALUES (3, 2044);
+INSERT INTO `sys_role_menu` VALUES (3, 2061);
+INSERT INTO `sys_role_menu` VALUES (3, 2062);
+INSERT INTO `sys_role_menu` VALUES (3, 2063);
+INSERT INTO `sys_role_menu` VALUES (3, 2064);
+INSERT INTO `sys_role_menu` VALUES (3, 2065);
+INSERT INTO `sys_role_menu` VALUES (3, 2066);
+INSERT INTO `sys_role_menu` VALUES (3, 2067);
+INSERT INTO `sys_role_menu` VALUES (3, 2068);
+INSERT INTO `sys_role_menu` VALUES (3, 2069);
+INSERT INTO `sys_role_menu` VALUES (3, 2070);
+INSERT INTO `sys_role_menu` VALUES (3, 2071);
+INSERT INTO `sys_role_menu` VALUES (3, 2072);
+INSERT INTO `sys_role_menu` VALUES (3, 2085);
+INSERT INTO `sys_role_menu` VALUES (3, 2086);
+INSERT INTO `sys_role_menu` VALUES (3, 2087);
+INSERT INTO `sys_role_menu` VALUES (3, 2088);
+INSERT INTO `sys_role_menu` VALUES (3, 2089);
+INSERT INTO `sys_role_menu` VALUES (3, 2090);
+INSERT INTO `sys_role_menu` VALUES (4, 1);
+INSERT INTO `sys_role_menu` VALUES (4, 2);
+INSERT INTO `sys_role_menu` VALUES (4, 3);
+INSERT INTO `sys_role_menu` VALUES (4, 4);
+INSERT INTO `sys_role_menu` VALUES (4, 100);
+INSERT INTO `sys_role_menu` VALUES (4, 101);
+INSERT INTO `sys_role_menu` VALUES (4, 102);
+INSERT INTO `sys_role_menu` VALUES (4, 103);
+INSERT INTO `sys_role_menu` VALUES (4, 104);
+INSERT INTO `sys_role_menu` VALUES (4, 105);
+INSERT INTO `sys_role_menu` VALUES (4, 106);
+INSERT INTO `sys_role_menu` VALUES (4, 107);
+INSERT INTO `sys_role_menu` VALUES (4, 108);
+INSERT INTO `sys_role_menu` VALUES (4, 109);
+INSERT INTO `sys_role_menu` VALUES (4, 110);
+INSERT INTO `sys_role_menu` VALUES (4, 111);
+INSERT INTO `sys_role_menu` VALUES (4, 112);
+INSERT INTO `sys_role_menu` VALUES (4, 113);
+INSERT INTO `sys_role_menu` VALUES (4, 114);
+INSERT INTO `sys_role_menu` VALUES (4, 115);
+INSERT INTO `sys_role_menu` VALUES (4, 116);
+INSERT INTO `sys_role_menu` VALUES (4, 500);
+INSERT INTO `sys_role_menu` VALUES (4, 501);
+INSERT INTO `sys_role_menu` VALUES (4, 1001);
+INSERT INTO `sys_role_menu` VALUES (4, 1008);
+INSERT INTO `sys_role_menu` VALUES (4, 1013);
+INSERT INTO `sys_role_menu` VALUES (4, 1017);
+INSERT INTO `sys_role_menu` VALUES (4, 1021);
+INSERT INTO `sys_role_menu` VALUES (4, 1026);
+INSERT INTO `sys_role_menu` VALUES (4, 1031);
+INSERT INTO `sys_role_menu` VALUES (4, 1036);
+INSERT INTO `sys_role_menu` VALUES (4, 1040);
+INSERT INTO `sys_role_menu` VALUES (4, 1043);
+INSERT INTO `sys_role_menu` VALUES (4, 1046);
+INSERT INTO `sys_role_menu` VALUES (4, 1049);
+INSERT INTO `sys_role_menu` VALUES (4, 1055);
+INSERT INTO `sys_role_menu` VALUES (4, 2000);
+INSERT INTO `sys_role_menu` VALUES (4, 2001);
+INSERT INTO `sys_role_menu` VALUES (4, 2002);
+INSERT INTO `sys_role_menu` VALUES (4, 2003);
+INSERT INTO `sys_role_menu` VALUES (4, 2004);
+INSERT INTO `sys_role_menu` VALUES (4, 2007);
+INSERT INTO `sys_role_menu` VALUES (4, 2008);
+INSERT INTO `sys_role_menu` VALUES (4, 2009);
+INSERT INTO `sys_role_menu` VALUES (4, 2010);
+INSERT INTO `sys_role_menu` VALUES (4, 2013);
+INSERT INTO `sys_role_menu` VALUES (4, 2014);
+INSERT INTO `sys_role_menu` VALUES (4, 2015);
+INSERT INTO `sys_role_menu` VALUES (4, 2016);
+INSERT INTO `sys_role_menu` VALUES (4, 2019);
+INSERT INTO `sys_role_menu` VALUES (4, 2020);
+INSERT INTO `sys_role_menu` VALUES (4, 2021);
+INSERT INTO `sys_role_menu` VALUES (4, 2022);
+INSERT INTO `sys_role_menu` VALUES (4, 2043);
+INSERT INTO `sys_role_menu` VALUES (4, 2044);
+INSERT INTO `sys_role_menu` VALUES (4, 2045);
+INSERT INTO `sys_role_menu` VALUES (4, 2046);
+INSERT INTO `sys_role_menu` VALUES (4, 2049);
+INSERT INTO `sys_role_menu` VALUES (4, 2050);
+INSERT INTO `sys_role_menu` VALUES (4, 2051);
+INSERT INTO `sys_role_menu` VALUES (4, 2052);
+INSERT INTO `sys_role_menu` VALUES (4, 2067);
+INSERT INTO `sys_role_menu` VALUES (4, 2068);
+INSERT INTO `sys_role_menu` VALUES (4, 2069);
+INSERT INTO `sys_role_menu` VALUES (4, 2070);
+INSERT INTO `sys_role_menu` VALUES (4, 2085);
+INSERT INTO `sys_role_menu` VALUES (4, 2086);
+INSERT INTO `sys_role_menu` VALUES (4, 2087);
+INSERT INTO `sys_role_menu` VALUES (4, 2088);
+INSERT INTO `sys_role_menu` VALUES (4, 2098);
+INSERT INTO `sys_role_menu` VALUES (4, 2099);
+INSERT INTO `sys_role_menu` VALUES (4, 2100);
+INSERT INTO `sys_role_menu` VALUES (4, 2101);
+INSERT INTO `sys_role_menu` VALUES (4, 2104);
+INSERT INTO `sys_role_menu` VALUES (4, 2105);
+INSERT INTO `sys_role_menu` VALUES (4, 2106);
+INSERT INTO `sys_role_menu` VALUES (4, 2107);
+INSERT INTO `sys_role_menu` VALUES (4, 2108);
+INSERT INTO `sys_role_menu` VALUES (4, 2109);
+INSERT INTO `sys_role_menu` VALUES (100, 2000);
+INSERT INTO `sys_role_menu` VALUES (100, 2001);
+INSERT INTO `sys_role_menu` VALUES (100, 2002);
+INSERT INTO `sys_role_menu` VALUES (100, 2003);
+INSERT INTO `sys_role_menu` VALUES (100, 2004);
+INSERT INTO `sys_role_menu` VALUES (100, 2005);
+INSERT INTO `sys_role_menu` VALUES (100, 2006);
+INSERT INTO `sys_role_menu` VALUES (100, 2007);
+INSERT INTO `sys_role_menu` VALUES (100, 2008);
+INSERT INTO `sys_role_menu` VALUES (100, 2009);
+INSERT INTO `sys_role_menu` VALUES (100, 2010);
+INSERT INTO `sys_role_menu` VALUES (100, 2011);
+INSERT INTO `sys_role_menu` VALUES (100, 2012);
+INSERT INTO `sys_role_menu` VALUES (100, 2013);
+INSERT INTO `sys_role_menu` VALUES (100, 2014);
+INSERT INTO `sys_role_menu` VALUES (100, 2015);
+INSERT INTO `sys_role_menu` VALUES (100, 2016);
+INSERT INTO `sys_role_menu` VALUES (100, 2017);
+INSERT INTO `sys_role_menu` VALUES (100, 2018);
+INSERT INTO `sys_role_menu` VALUES (100, 2019);
+INSERT INTO `sys_role_menu` VALUES (100, 2020);
+INSERT INTO `sys_role_menu` VALUES (100, 2021);
+INSERT INTO `sys_role_menu` VALUES (100, 2022);
+INSERT INTO `sys_role_menu` VALUES (100, 2023);
+INSERT INTO `sys_role_menu` VALUES (100, 2024);
+INSERT INTO `sys_role_menu` VALUES (100, 2031);
+INSERT INTO `sys_role_menu` VALUES (100, 2032);
+INSERT INTO `sys_role_menu` VALUES (100, 2033);
+INSERT INTO `sys_role_menu` VALUES (100, 2034);
+INSERT INTO `sys_role_menu` VALUES (100, 2035);
+INSERT INTO `sys_role_menu` VALUES (100, 2036);
+INSERT INTO `sys_role_menu` VALUES (100, 2037);
+INSERT INTO `sys_role_menu` VALUES (100, 2038);
+INSERT INTO `sys_role_menu` VALUES (100, 2039);
+INSERT INTO `sys_role_menu` VALUES (100, 2040);
+INSERT INTO `sys_role_menu` VALUES (100, 2041);
+INSERT INTO `sys_role_menu` VALUES (100, 2042);
+INSERT INTO `sys_role_menu` VALUES (100, 2043);
+INSERT INTO `sys_role_menu` VALUES (100, 2044);
+INSERT INTO `sys_role_menu` VALUES (100, 2045);
+INSERT INTO `sys_role_menu` VALUES (100, 2046);
+INSERT INTO `sys_role_menu` VALUES (100, 2047);
+INSERT INTO `sys_role_menu` VALUES (100, 2048);
+INSERT INTO `sys_role_menu` VALUES (100, 2049);
+INSERT INTO `sys_role_menu` VALUES (100, 2050);
+INSERT INTO `sys_role_menu` VALUES (100, 2051);
+INSERT INTO `sys_role_menu` VALUES (100, 2052);
+INSERT INTO `sys_role_menu` VALUES (100, 2053);
+INSERT INTO `sys_role_menu` VALUES (100, 2054);
+INSERT INTO `sys_role_menu` VALUES (100, 2061);
+INSERT INTO `sys_role_menu` VALUES (100, 2062);
+INSERT INTO `sys_role_menu` VALUES (100, 2063);
+INSERT INTO `sys_role_menu` VALUES (100, 2064);
+INSERT INTO `sys_role_menu` VALUES (100, 2065);
+INSERT INTO `sys_role_menu` VALUES (100, 2066);
+INSERT INTO `sys_role_menu` VALUES (101, 1);
+INSERT INTO `sys_role_menu` VALUES (101, 2);
+INSERT INTO `sys_role_menu` VALUES (101, 100);
+INSERT INTO `sys_role_menu` VALUES (101, 101);
+INSERT INTO `sys_role_menu` VALUES (101, 102);
+INSERT INTO `sys_role_menu` VALUES (101, 103);
+INSERT INTO `sys_role_menu` VALUES (101, 104);
+INSERT INTO `sys_role_menu` VALUES (101, 107);
+INSERT INTO `sys_role_menu` VALUES (101, 109);
+INSERT INTO `sys_role_menu` VALUES (101, 110);
+INSERT INTO `sys_role_menu` VALUES (101, 1001);
+INSERT INTO `sys_role_menu` VALUES (101, 1008);
+INSERT INTO `sys_role_menu` VALUES (101, 1013);
+INSERT INTO `sys_role_menu` VALUES (101, 1017);
+INSERT INTO `sys_role_menu` VALUES (101, 1021);
+INSERT INTO `sys_role_menu` VALUES (101, 1036);
+INSERT INTO `sys_role_menu` VALUES (101, 1046);
+INSERT INTO `sys_role_menu` VALUES (101, 1049);
+INSERT INTO `sys_role_menu` VALUES (101, 2000);
+INSERT INTO `sys_role_menu` VALUES (101, 2001);
+INSERT INTO `sys_role_menu` VALUES (101, 2002);
+INSERT INTO `sys_role_menu` VALUES (101, 2007);
+INSERT INTO `sys_role_menu` VALUES (101, 2008);
+INSERT INTO `sys_role_menu` VALUES (101, 2013);
+INSERT INTO `sys_role_menu` VALUES (101, 2014);
+INSERT INTO `sys_role_menu` VALUES (101, 2019);
+INSERT INTO `sys_role_menu` VALUES (101, 2020);
+INSERT INTO `sys_role_menu` VALUES (101, 2031);
+INSERT INTO `sys_role_menu` VALUES (101, 2032);
+INSERT INTO `sys_role_menu` VALUES (101, 2037);
+INSERT INTO `sys_role_menu` VALUES (101, 2038);
+INSERT INTO `sys_role_menu` VALUES (101, 2043);
+INSERT INTO `sys_role_menu` VALUES (101, 2044);
+INSERT INTO `sys_role_menu` VALUES (101, 2049);
+INSERT INTO `sys_role_menu` VALUES (101, 2050);
+INSERT INTO `sys_role_menu` VALUES (101, 2061);
+INSERT INTO `sys_role_menu` VALUES (101, 2062);
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/springboot/wumei-admin/src/main/resources/application-druid.yml b/springboot/wumei-admin/src/main/resources/application-druid.yml
index 2b667efc..153f3778 100644
--- a/springboot/wumei-admin/src/main/resources/application-druid.yml
+++ b/springboot/wumei-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,8 @@ spring:
             master:
                 url: jdbc:mysql://localhost/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: wumei-smart
+#                password: wumei-smart
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/springboot/wumei-admin/src/main/resources/application.yml b/springboot/wumei-admin/src/main/resources/application.yml
index 9d7079ea..636091da 100644
--- a/springboot/wumei-admin/src/main/resources/application.yml
+++ b/springboot/wumei-admin/src/main/resources/application.yml
@@ -65,7 +65,8 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: wumei-smart
+#    password: wumei-smart
+    password: 123456
     # 连接超时时间
     timeout: 10s
     lettuce:
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
index 89b918b0..32993ae9 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
@@ -66,9 +66,9 @@ public class DeviceController extends BaseController
     @PreAuthorize("@ss.hasPermi('iot:device:list')")
     @GetMapping("/all")
     @ApiOperation("查询所有设备简短列表")
-    public TableDataInfo allShortList()
+    public TableDataInfo allShortList(Device device)
     {
-        List<DeviceAllShortOutput> list = deviceService.selectAllDeviceShortList();
+        List<DeviceAllShortOutput> list = deviceService.selectAllDeviceShortList1(device.getUserName());
         return getDataTable(list);
     }
 
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java
index 7d0d9241..5bd5516a 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java
@@ -161,4 +161,6 @@ public interface DeviceMapper
      * @return
      */
     public int deleteDeviceGroupByDeviceIds(Long[] deviceIds);
+//    查询简短设备列表
+    List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java
index 266cd8fe..45f229a9 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java
@@ -151,4 +151,7 @@ public interface IDeviceService
      * @return 结果
      */
     public String generationDeviceNum();
+
+    //    获取所有简短设备列表
+    List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
index 96205dd8..43a4af92 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -534,6 +534,12 @@ public class DeviceServiceImpl implements IDeviceService {
         return "";
     }
 
+    @Override
+    public List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName) {
+        return deviceMapper.selectAllDeviceShortList1(userName);
+    }
+
+
     /**
      *
      * @param device 设备
diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
index 033a64eb..fc878df0 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -105,6 +105,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select device_id, device_name,product_id, serial_number, status,is_shadow ,is_custom_location,things_model_value, active_time from iot_device
     </sql>
 
+    <select id="selectAllDeviceShortList1" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceAllShortResult">
+        select device_id, device_name, product_name, user_name, serial_number, firmware_version, status,rssi,is_shadow ,
+        is_custom_location, active_time,network_address,longitude,latitude from iot_device
+        <where>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+        </where>
+    </select>
     <select id="selectDeviceList" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceResult">
         <include refid="selectDeviceVo"/>
         <where>  
diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml
index f0ec9c74..f9cf3ba3 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml
@@ -30,8 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="tenantName != null  and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
             <if test="isSys != null "> and is_sys = #{isSys}</if>
+            <if test="isSys == null "> and is_sys = 1</if>
         </where>
-        order by create_time desc
+       order by create_time desc
     </select>
     
     <select id="selectFirmwareByFirmwareId" parameterType="Long" resultMap="FirmwareResult">
diff --git a/vue/src/api/iot/device.js b/vue/src/api/iot/device.js
index e5d83bcc..0dbb8a09 100644
--- a/vue/src/api/iot/device.js
+++ b/vue/src/api/iot/device.js
@@ -2,84 +2,91 @@ import request from '@/utils/request'
 
 // 查询设备列表
 export function listDevice(query) {
-  return request({
-    url: '/iot/device/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/iot/device/list',
+        method: 'get',
+        params: query
+    })
 }
 
 // 查询设备简短列表
 export function listDeviceShort(query) {
-  return request({
-    url: '/iot/device/shortList',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/iot/device/shortList',
+        method: 'get',
+        params: query
+    })
 }
 
 // 查询所有设备简短列表
 export function listAllDeviceShort() {
-  return request({
-    url: '/iot/device/all',
-    method: 'get',
-  })
+    return request({
+        url: '/iot/device/all',
+        method: 'get',
+    })
+}
+// 查询所有设备简短列表
+export function listAllDeviceShort2(query) {
+    return request({
+        url: '/iot/device/all',
+        method: 'get',
+        params: query
+    })
 }
-
 // 查询设备详细
 export function getDevice(deviceId) {
-  return request({
-    url: '/iot/device/' + deviceId,
-    method: 'get'
-  })
+    return request({
+        url: '/iot/device/' + deviceId,
+        method: 'get'
+    })
 }
 
 // 查询设备运行状态详细
 export function getDeviceRunningStatus(deviceId) {
-  return request({
-    url: '/iot/device/runningStatus/' + deviceId,
-    method: 'get'
-  })
+    return request({
+        url: '/iot/device/runningStatus/' + deviceId,
+        method: 'get'
+    })
 }
 
 // 查询设备物模型的值
 export function getDeviceThingsModelValue(deviceId) {
-  return request({
-    url: '/iot/device/thingsModelValue/' + deviceId,
-    method: 'get'
-  })
+    return request({
+        url: '/iot/device/thingsModelValue/' + deviceId,
+        method: 'get'
+    })
 }
 
 // 新增设备
 export function addDevice(data) {
-  return request({
-    url: '/iot/device',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/iot/device',
+        method: 'post',
+        data: data
+    })
 }
 
 // 修改设备
 export function updateDevice(data) {
-  return request({
-    url: '/iot/device',
-    method: 'put',
-    data: data
-  })
+    return request({
+        url: '/iot/device',
+        method: 'put',
+        data: data
+    })
 }
 
 // 删除设备
 export function delDevice(deviceId) {
-  return request({
-    url: '/iot/device/' + deviceId,
-    method: 'delete'
-  })
+    return request({
+        url: '/iot/device/' + deviceId,
+        method: 'delete'
+    })
 }
 
 // 生成设备编号
 export function generatorDeviceNum() {
-  return request({
-    url: '/iot/device/generator',
-    method: 'get'
-  })
-}
+    return request({
+        url: '/iot/device/generator',
+        method: 'get'
+    })
+}
\ No newline at end of file
diff --git a/vue/src/views/index.vue b/vue/src/views/index.vue
index a45660f7..3b02edb8 100644
--- a/vue/src/views/index.vue
+++ b/vue/src/views/index.vue
@@ -97,7 +97,7 @@
         </el-col>
 
     </el-row>
-
+  <div v-show="isAdmin">
     <el-row :gutter="40" style="margin-top:80px;">
         <el-col :span="1">
             <el-card style="margin:-10px;height:218px;margin-right:-31px;padding-top:35px;text-align:center;font-weight:bold;" shadow="none">
@@ -144,7 +144,7 @@
             </el-card>
         </el-col>
     </el-row>
-
+   </div>
     <div style="margin:-21px;margin-top:100px;bottom:0;border:1px solid #ccc;padding:10px;margin-bottom:-21px;">
         <div>
             <el-link href="http://wumei.live" target="_blank" type="primary" style="margin-left:20px;">开源生活物联网平台 >></el-link>
@@ -175,6 +175,7 @@ import {
 } from "@/api/iot/emqx";
 import {
     listAllDeviceShort,
+    listAllDeviceShort2
 } from "@/api/iot/device";
 
 export default {
@@ -184,6 +185,11 @@ export default {
     },
     data() {
         return {
+            // 控制是否显示服务器状态栏
+            isAdmin:true,
+            queryParams:{
+              userName: ''
+            },
             // 设备列表
             deviceList: [],
             // 设备总数
@@ -220,61 +226,24 @@ export default {
         };
     },
     created() {
-        // this.deviceList = [{
-        //         id: 21,
-        //         name: '海门',
-        //         value: 9,
-        //         long: 121.15,
-        //         lat: 31.89,
-        //         address: "海门",
-        //         product: "测试产品",
-        //         version: 1.0,
-        //         status: 1,
-        //     },
-        //     {
-        //         id: 21,
-        //         name: '鄂尔多斯',
-        //         value: 12,
-        //         long: 109.781327,
-        //         lat: 39.608266,
-        //         address: "海门",
-        //         product: "测试产品",
-        //         version: 2.0,
-        //         status: 2
-        //     },
-        //     {
-        //         id: 21,
-        //         name: '招远',
-        //         value: 12,
-        //         long: 120.38,
-        //         lat: 37.35,
-        //         address: "海门",
-        //         product: "测试产品",
-        //         version: 1.0,
-        //         status: 3
-        //     },
-        //     {
-        //         id: 21,
-        //         name: '海口',
-        //         value: 12,
-        //         long: 110.38,
-        //         lat: 20.35,
-        //         address: "测试",
-        //         product: "测试产品",
-        //         version: 1.0,
-        //         status: 4
-        //     }
-        // ];
+        this.init();
         this.getAllDevice();
         this.getServer();
         this.getMqttStats();
         this.statisticMqtt();
-
     },
     methods: {
+        init(){
+          // 设置用户的角色 用以区分自己创建的设备
+          // 由于admin可以看所有数据所以判断
+          if (this.$store.state.user.roles !="admin"){
+            this.isAdmin = false
+            this.queryParams.userName = this.$store.state.user.name
+          }
+        },
         /**查询所有设备 */
         getAllDevice() {
-            listAllDeviceShort().then(response => {
+            listAllDeviceShort2(this.queryParams).then(response => {
                 this.deviceList = response.rows;
                 this.deviceCount=response.total;
                 this.$nextTick(() => {
diff --git a/vue/src/views/iot/category/index.vue b/vue/src/views/iot/category/index.vue
index af40da30..f928cc13 100644
--- a/vue/src/views/iot/category/index.vue
+++ b/vue/src/views/iot/category/index.vue
@@ -52,7 +52,7 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
                     <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:category:edit']">修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category:remove']">删除</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:category:remove']" :disabled="scope.row.isSys == '1' ? (canEdit ? false : true) : false">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -73,7 +73,7 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button type="primary" @click="submitForm" :disabled="form.isSys == '1' ? (canEdit ? false : true) : false">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
@@ -96,6 +96,8 @@ export default {
     dicts: ["iot_yes_no"],
     data() {
         return {
+            // 判断是否获取到修改权限
+            canEdit:false,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -151,8 +153,14 @@ export default {
     },
     created() {
         this.getList();
+        this.init();
     },
     methods: {
+        init(){
+        if (this.$store.state.user.roles =="admin"){
+            this.canEdit = true
+          }
+        },
         /** 查询产品分类列表 */
         getList() {
             this.loading = true;
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index 033b9cb4..26b66b15 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -450,6 +450,11 @@ export default {
                 this.queryParams.params["beginActiveTime"] = this.daterangeActiveTime[0];
                 this.queryParams.params["endActiveTime"] = this.daterangeActiveTime[1];
             }
+           // 设置用户的角色 用以区分自己创建的设备
+          // 由于admin可以看所有数据所以判断
+          if (this.$store.state.user.roles !=="admin"){
+            this.queryParams.userName = this.$store.state.user.name
+          }
             listDeviceShort(this.queryParams).then(response => {
                 this.deviceList = response.rows;
                 this.total = response.total;
diff --git a/vue/src/views/iot/firmware/index.vue b/vue/src/views/iot/firmware/index.vue
index 92c401b2..fac4c899 100644
--- a/vue/src/views/iot/firmware/index.vue
+++ b/vue/src/views/iot/firmware/index.vue
@@ -58,7 +58,7 @@
                 <template slot-scope="scope">
                     <el-button size="small" type="info" style="padding:5px;" icon="el-icon-download" @click="handleDownload(scope.row)">下载</el-button>
                     <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:firmware:edit']">修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:firmware:remove']">删除</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:firmware:remove']" :disabled="scope.row.isSys == '1' ? (canEdit ? false : true) : false">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -88,7 +88,7 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button type="primary" @click="submitForm" :disabled="form.isSys == '1' ? (canEdit ? false : true) : false">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
@@ -124,6 +124,8 @@ export default {
     },
     data() {
         return {
+            // 判断是否有修改权限
+            canEdit:false,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -217,10 +219,19 @@ export default {
     created() {
         this.getList();
         this.getProductShortList();
+        this.init();
     },
     methods: {
+     init(){
+        if (this.$store.state.user.roles =="admin"){
+            this.canEdit = true
+          }
+        },
         /** 查询产品固件列表 */
         getList() {
+            if (this.$store.state.user.roles !="admin"){
+              this.queryParams.tenantName = this.$store.state.user.name
+            }
             this.loading = true;
             listFirmware(this.queryParams).then(response => {
                 this.firmwareList = response.rows;
diff --git a/vue/src/views/iot/group/index.vue b/vue/src/views/iot/group/index.vue
index b0aee627..bd741477 100644
--- a/vue/src/views/iot/group/index.vue
+++ b/vue/src/views/iot/group/index.vue
@@ -158,6 +158,11 @@ export default {
         /** 查询设备分组列表 */
         getList() {
             this.loading = true;
+             // 设置用户的角色 用以区分自己创建的设备
+            // 由于admin可以看所有数据所以判断
+            if (this.$store.state.user.roles !=="admin"){
+              this.queryParams.userName = this.$store.state.user.name
+            }
             listGroup(this.queryParams).then(response => {
                 this.groupList = response.rows;
                 this.total = response.total;
diff --git a/vue/src/views/iot/product/index.vue b/vue/src/views/iot/product/index.vue
index b88f69a0..d438e353 100644
--- a/vue/src/views/iot/product/index.vue
+++ b/vue/src/views/iot/product/index.vue
@@ -22,10 +22,10 @@
             </el-form-item>
         </el-form>
     </el-card>
-
     <el-card style="padding-bottom:100px;">
         <el-row :gutter="30" v-loading="loading" >
-            <el-col :span="6" v-for="(item,index) in productList" :key="index" style="margin-bottom:30px;text-align:center;">
+            <el-col :span="6" v-for="(item,index) in productList" :key="index" style="margin-bottom:30px;text-align:center;"  v-show="(item.isSys == 1) || (userName == item.tenantName)">
+                <div>
                 <el-card :body-style="{ padding: '20px'}" shadow="always">
                     <el-row type="flex" :gutter="10" justify="space-between">
                         <el-col :span="20" style="text-align:left;">
@@ -80,6 +80,7 @@
                         <el-button size="mini" type="warning" icon="el-icon-search" @click="handleViewDevice(item.productId)" v-hasPermi="['tool:gen:edit']">查看设备</el-button>
                     </el-button-group>
                 </el-card>
+             </div>
             </el-col>
         </el-row>
 
@@ -117,6 +118,9 @@ export default {
     dicts: ['iot_yes_no', 'iot_product_status', 'iot_device_type', 'iot_network_method', 'iot_vertificate_method', 'iot_device_chip'],
     data() {
         return {
+            userName:'',
+            // 判断用户是否是管理员
+            isAdmin:false,
             // 遮罩层
             loading: true,
             // 总条数
@@ -148,6 +152,7 @@ export default {
     },
     created() {
         this.getList();
+        this.init();
     },
     activated() {
         const time = this.$route.query.t;
@@ -158,6 +163,17 @@ export default {
         }
     },
     methods: {
+        init(){
+        if (this.$store.state.user.roles =="admin"){
+            this.isAdmin = true
+            // 显示全部的情况 = 角色是管理员admin
+            // 显示系统定义和自己 = 角色是租户
+            // 都会显示 = 系统定义
+            // 条件： isSys = '1' || this.$store.state.user.name == item.tenantName
+          }
+          this.userName = this.$store.state.user.name 
+          console.log(this.userName)
+        },
         /** 查询产品列表 */
         getList() {
             this.loading = true;
diff --git a/vue/src/views/iot/template/index.vue b/vue/src/views/iot/template/index.vue
index e93c7bb1..1ab050af 100644
--- a/vue/src/views/iot/template/index.vue
+++ b/vue/src/views/iot/template/index.vue
@@ -76,7 +76,7 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
                     <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']">修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']">删除</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" :disabled="scope.row.isSys == '1' ? (canEdit ? false : true) : false">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -184,7 +184,7 @@
             </el-form>
 
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button type="primary" @click="submitForm" :disabled="form.isSys == '1' ? (canEdit ? false : true) : false">确 定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
@@ -212,6 +212,8 @@ export default {
     dicts: ["iot_things_type", "iot_data_type", "iot_yes_no"],
     data() {
         return {
+            // 是否具有修改权限 admin可以修改系统定义的通用物 其他不可以
+            canEdit: false,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -271,8 +273,14 @@ export default {
     },
     created() {
         this.getList();
+        this.init();
     },
     methods: {
+        init(){
+        if (this.$store.state.user.roles =="admin"){
+            this.canEdit = true
+          }
+        },
         /** 查询通用物模型列表 */
         getList() {
             this.loading = true;
diff --git a/vue/src/views/system/role/index.vue b/vue/src/views/system/role/index.vue
index 50ef826b..e2f9fc85 100644
--- a/vue/src/views/system/role/index.vue
+++ b/vue/src/views/system/role/index.vue
@@ -137,6 +137,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
+            :disabled="scope.row.roleKey !== 'visitor'"
           >删除</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
             <span class="el-dropdown-link">