diff --git a/springboot/wumei-admin/src/main/resources/application.yml b/springboot/wumei-admin/src/main/resources/application.yml
index de4a59e06208813860a1a5ec1989b516bb93964d..2dce89043903a888e61aea37e047ef44c6cc8dce 100644
--- a/springboot/wumei-admin/src/main/resources/application.yml
+++ b/springboot/wumei-admin/src/main/resources/application.yml
@@ -65,7 +65,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: wumei-smart
+#    password: wumei-smart
 #    password: 123456
     # 连接超时时间
     timeout: 10s
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java
index 0d22c397c15cd6449751723c00b0c99cefc34723..fd657d599ea4d4748d4cf4d0b19538062291a98a 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java
@@ -54,7 +54,7 @@ public class CategoryController extends BaseController
         {
             list = categoryService.selectCategoryList(category);
         }else {
-            list = categoryService.selectCategoryList1(category);
+            list = categoryService.selectCategoryListAccurate(category);
         }
 
         return getDataTable(list);
@@ -73,7 +73,7 @@ public class CategoryController extends BaseController
         {
             list = categoryService.selectCategoryShortList();
         }else {
-            list = categoryService.selectCategoryShortList1(category);
+            list = categoryService.selectCategoryShortListAccurate(category);
         }
         return AjaxResult.success(list);
     }
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 b91256e08c097ac6eab8a1a62578d0979f375b40..b7746123d8283edad09a8ac03acfa5f033704b15 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
@@ -48,11 +48,9 @@ public class DeviceController extends BaseController
         if(device.getUserName()==null || device.getUserName()=="" )
         {
             list = deviceService.selectDeviceList(device);
-            System.out.print("进入模糊查询");
         }else {
             //            精确查询
-            System.out.print("进入精准查询"+device.getUserName());
-            list = deviceService.selectDeviceList1(device);
+            list = deviceService.selectDeviceListAccurate(device);
         }
         return getDataTable(list);
     }
@@ -72,7 +70,7 @@ public class DeviceController extends BaseController
             list = deviceService.selectDeviceShortList(device);
         }else {
             //            精确查询
-            list = deviceService.selectDeviceShortList1(device);
+            list = deviceService.selectDeviceShortListAccurate(device);
         }
         return getDataTable(list);
     }
@@ -85,7 +83,13 @@ public class DeviceController extends BaseController
     @ApiOperation("查询所有设备简短列表")
     public TableDataInfo allShortList(Device device)
     {
-        List<DeviceAllShortOutput> list = deviceService.selectAllDeviceShortList1(device.getUserName());
+        List<DeviceAllShortOutput> list = new ArrayList<>();
+        if(device.getUserName()==null || device.getUserName() == "")
+        {
+            list = deviceService.selectAllDeviceShortList();
+        }else {
+            list = deviceService.selectAllDeviceShortListAccurate(device.getUserName());
+        }
         return getDataTable(list);
     }
 
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java
index 2913a5ba4ae2565c5e30d1c629c7e11853d5e7bb..a283773f46141dc19b7e6f45cec7cfeb09eb502e 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java
@@ -58,7 +58,7 @@ public class GroupController extends BaseController
 
         }else {
 //            精准查询
-            list = groupService.selectGroupList1(group);
+            list = groupService.selectGroupListAccurate(group);
         }
         return getDataTable(list);
     }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java
index bf2a48b6f945a4bc2dc08bf47ab197b4db497704..88d0900cd776ebd5193841a5f0f1041a36f8c13b 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java
@@ -48,7 +48,7 @@ public class ProductController extends BaseController
         {
             list = productService.selectProductList(product);
         }else {
-            list = productService.selectProductList1(product);
+            list = productService.selectProductListAccurate(product);
         }
         return getDataTable(list);
     }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java
index cd91eb6732fe69053165fbdb70f4c041adbd35a2..bbc20a9915fed36d9cae2b6f1fc26cf0c432e15e 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java
@@ -53,7 +53,7 @@ public class ThingsModelTemplateController extends BaseController
             list = thingsModelTemplateService.selectThingsModelTemplateList(thingsModelTemplate);
         }else{
 //            精准查询
-            list = thingsModelTemplateService.selectThingsModelTemplateList1(thingsModelTemplate);
+            list = thingsModelTemplateService.selectThingsModelTemplateListAccurate(thingsModelTemplate);
         }
                return getDataTable(list);
     }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java
index 29cdc4870381e187c04de2aa0ca3332985167c57..5b357f8816a71dec1890c23ee3a0a360b0a08d96 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java
@@ -78,7 +78,7 @@ public interface CategoryMapper
      */
     public int productCountInCategorys(Long[] categoryIds);
     //    精准查询
-    List<Category> selectCategoryList1(Category category);
+    List<Category> selectCategoryListAccurate(Category category);
 
-    List<IdAndName> selectCategoryShortList1(Category category);
+    List<IdAndName> selectCategoryShortListAccurate(Category category);
 }
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 4527855a206cea0d927e53d5e944fe11d7fa8797..ef05f333411e3e8d71a0b154a8ea7288ab4b476e 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
@@ -162,9 +162,9 @@ public interface DeviceMapper
      */
     public int deleteDeviceGroupByDeviceIds(Long[] deviceIds);
 //    查询所有简短设备列表
-    List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName);
+    List<DeviceAllShortOutput> selectAllDeviceShortListAccurate(String userName);
 //精准查询
-    List<Device> selectDeviceList1(Device device);
+    List<Device> selectDeviceListAccurate(Device device);
 
-    List<DeviceShortOutput> selectDeviceShortList1(Device device);
+    List<DeviceShortOutput> selectDeviceShortListAccurate(Device device);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java
index 3004f9f986f9b6932d6603b36569efd3206ef4a3..4f72fdadbbb0f28c01f47add1b7e5127fbb1f7a3 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java
@@ -85,5 +85,5 @@ public interface GroupMapper
     public int deleteDeviceGroupByGroupIds(Long[] groupIds);
 
 //    精准查询所有
-    List<Group> selectGroupList1(Group group);
+    List<Group> selectGroupListAccurate(Group group);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java
index 7f6b901f09a0075ca369c8ea239604ef62507a80..dc9a561482c9d57a9b0c0ea28966fc869ebe730a 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java
@@ -117,5 +117,5 @@ public interface ProductMapper
      */
     public int thingsCountInProduct(Long productId);
     //    精准查询
-    List<Product> selectProductList1(Product product);
+    List<Product> selectProductListAccurate(Product product);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java
index 82c970f475bf9369bc059ecd0e7db9fba84f02de..75478ac6aa5d95505e519e0d17d3363ab2033ccd 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java
@@ -69,5 +69,5 @@ public interface ThingsModelTemplateMapper
      */
     public int deleteThingsModelTemplateByTemplateIds(Long[] templateIds);
     //    精准查询
-    List<ThingsModelTemplate> selectThingsModelTemplateList1(ThingsModelTemplate thingsModelTemplate);
+    List<ThingsModelTemplate> selectThingsModelTemplateListAccurate(ThingsModelTemplate thingsModelTemplate);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java
index ab9c4df9e3fbb060747f97b2bfb0a8cde12dbf6f..8d610e004e2aa9bf299d4e2a5190ae1b3eabbbb7 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java
@@ -70,7 +70,7 @@ public interface ICategoryService
     public int deleteCategoryByCategoryId(Long categoryId);
 
 //    精准查询
-    List<Category> selectCategoryList1(Category category);
+    List<Category> selectCategoryListAccurate(Category category);
 
-    List<IdAndName> selectCategoryShortList1(Category category);
+    List<IdAndName> selectCategoryShortListAccurate(Category category);
 }
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 99350e32375619435f91e42a9f327fb06d1af1c6..a8cff481a220b09c7ffcef6aceb1aa7ae1c12921 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
@@ -153,11 +153,11 @@ public interface IDeviceService
     public String generationDeviceNum();
 
     //    获取所有简短设备列表
-    List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName);
+    List<DeviceAllShortOutput> selectAllDeviceShortListAccurate(String userName);
 
 //    精准查询
-    List<Device> selectDeviceList1(Device device);
+    List<Device> selectDeviceListAccurate(Device device);
 
 //    精准查询所有条件设备的简短信息
-    List<DeviceShortOutput> selectDeviceShortList1(Device device);
+    List<DeviceShortOutput> selectDeviceShortListAccurate(Device device);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java
index 8bbd00c69a5104861080978c3c6c6b4e4c761152..db9ce7213d814931322267053617609560c5462c 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java
@@ -75,5 +75,5 @@ public interface IGroupService
     public int deleteGroupByGroupId(Long groupId);
 
 //    精准查询
-    List<Group> selectGroupList1(Group group);
+    List<Group> selectGroupListAccurate(Group group);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java
index 59e0cf0b5a93f6c5a97f711275de135fa4b52388..f1d1753f4be65e006924f1f459f1aeefaf47d46e 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java
@@ -79,5 +79,5 @@ public interface IProductService
     public int deleteProductByProductId(Long productId);
 
 //    精准查询
-    List<Product> selectProductList1(Product product);
+    List<Product> selectProductListAccurate(Product product);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java
index 59367c6f65e24eeb265fae177b89e91ebaeea997..40307c452e886e24846e07b276b18861d0a6bb0a 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java
@@ -60,5 +60,5 @@ public interface IThingsModelTemplateService
     public int deleteThingsModelTemplateByTemplateId(Long templateId);
 
 //    精准查询
-    List<ThingsModelTemplate> selectThingsModelTemplateList1(ThingsModelTemplate thingsModelTemplate);
+    List<ThingsModelTemplate> selectThingsModelTemplateListAccurate(ThingsModelTemplate thingsModelTemplate);
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java
index cc92509d0b92e30ead8995429ede70fb65abfa85..82cdaab7e049b83abe32f2b768c036ba64cd9ec2 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java
@@ -98,8 +98,8 @@ public class CategoryServiceImpl implements ICategoryService
     }
 
     @Override
-    public List<IdAndName> selectCategoryShortList1(Category category) {
-        return categoryMapper.selectCategoryShortList1(category);
+    public List<IdAndName> selectCategoryShortListAccurate(Category category) {
+        return categoryMapper.selectCategoryShortListAccurate(category);
     }
 
     /**
@@ -134,7 +134,7 @@ public class CategoryServiceImpl implements ICategoryService
     }
 
     @Override
-    public List<Category> selectCategoryList1(Category category) {
-        return categoryMapper.selectCategoryList1(category);
+    public List<Category> selectCategoryListAccurate(Category category) {
+        return categoryMapper.selectCategoryListAccurate(category);
     }
 }
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 88ac044d799b3e5703aea3662f8268bc9dbee7a3..5bda376fcae9083517db9a19f0e2c9b2a4bfc0ba 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
@@ -252,8 +252,8 @@ public class DeviceServiceImpl implements IDeviceService {
 
 //    精准查询所有条件的设备
     @Override
-    public List<DeviceShortOutput> selectDeviceShortList1(Device device) {
-        return deviceMapper.selectDeviceShortList1(device);
+    public List<DeviceShortOutput> selectDeviceShortListAccurate(Device device) {
+        return deviceMapper.selectDeviceShortListAccurate(device);
     }
 
     /**
@@ -541,13 +541,13 @@ public class DeviceServiceImpl implements IDeviceService {
     }
 
     @Override
-    public List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName) {
-        return deviceMapper.selectAllDeviceShortList1(userName);
+    public List<DeviceAllShortOutput> selectAllDeviceShortListAccurate(String userName) {
+        return deviceMapper.selectAllDeviceShortListAccurate(userName);
     }
 //    精准查询
     @Override
-    public List<Device> selectDeviceList1(Device device) {
-        return deviceMapper.selectDeviceList1(device);
+    public List<Device> selectDeviceListAccurate(Device device) {
+        return deviceMapper.selectDeviceListAccurate(device);
     }
 
 
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java
index 6e30dadafd6745af9e030e0ea9f1518ecdd91354..f63dac754ff7e301f3d27d78379f5269d96c8d09 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java
@@ -142,7 +142,7 @@ public class GroupServiceImpl implements IGroupService
 
 //    精准查询所有
     @Override
-    public List<Group> selectGroupList1(Group group) {
-        return groupMapper.selectGroupList1(group);
+    public List<Group> selectGroupListAccurate(Group group) {
+        return groupMapper.selectGroupListAccurate(group);
     }
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java
index fadf43ba5128e9749ab8b23c6465e481254271e2..596e70ec830b06eb52a4f6fb0f0be3cefacce37c 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java
@@ -196,7 +196,7 @@ public class ProductServiceImpl implements IProductService
     }
     //    精准查询
     @Override
-    public List<Product> selectProductList1(Product product) {
-        return productMapper.selectProductList1(product);
+    public List<Product> selectProductListAccurate(Product product) {
+        return productMapper.selectProductListAccurate(product);
     }
 }
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java
index 07a035963f394ffc1449cd30baa56348c6b0025d..ce808bb7089936ad4d5f04bd97ac02099697b544 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java
@@ -110,7 +110,7 @@ public class ThingsModelTemplateServiceImpl implements IThingsModelTemplateServi
     }
     //    精准查询
     @Override
-    public List<ThingsModelTemplate> selectThingsModelTemplateList1(ThingsModelTemplate thingsModelTemplate) {
-        return thingsModelTemplateMapper.selectThingsModelTemplateList1(thingsModelTemplate);
+    public List<ThingsModelTemplate> selectThingsModelTemplateListAccurate(ThingsModelTemplate thingsModelTemplate) {
+        return thingsModelTemplateMapper.selectThingsModelTemplateListAccurate(thingsModelTemplate);
     }
 }
diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml
index 0f7d9326132a7e5ba680b3125414eae97a1b0388..d2d44dbb8d748f0640ea58b72cb2a7acf97fac12 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by order_num
     </select>
-    <select id="selectCategoryList1" parameterType="com.ruoyi.iot.domain.Category" resultMap="CategoryResult">
+    <select id="selectCategoryListAccurate" parameterType="com.ruoyi.iot.domain.Category" resultMap="CategoryResult">
         <include refid="selectCategoryVo"/>
         <where>
             <if test="categoryName != null  and categoryName != ''"> and category_name = #{categoryName}</if>
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from iot_category
         order by order_num
     </select>
-    <select id="selectCategoryShortList1"  resultMap="CategoryShortResult">
+    <select id="selectCategoryShortListAccurate"  resultMap="CategoryShortResult">
         select category_id, category_name
         from iot_category
         <where>
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 66274bfd0109b1d3ffd155d17d19aa1b42519137..72d57edafea50da76630fb73edd48fcd3b8bc8f5 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -105,7 +105,7 @@ 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 id="selectAllDeviceShortListAccurate" 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>
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    <select id="selectDeviceList1" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceResult">
+    <select id="selectDeviceListAccurate" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceResult">
         <include refid="selectDeviceVo"/>
         <where>
             <if test="deviceName != null  and deviceName != ''"> and device_name = #{deviceName}</if>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    <select id="selectDeviceShortList1" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceShortResult">
+    <select id="selectDeviceShortListAccurate" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceShortResult">
         <include refid="selectDeviceShortVo"/>
         <where>
             <if test="deviceName != null  and deviceName != ''"> and device_name = #{deviceName}</if>
diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml
index 562de0dfb18a1a7abc1480f68a42879525e6df3c..1f0e37ce43e8ee9704e31042c54c9580dba5327e 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by group_order
     </select>
-    <select id="selectGroupList1" parameterType="com.ruoyi.iot.domain.Group" resultMap="GroupResult">
+    <select id="selectGroupListAccurate" parameterType="com.ruoyi.iot.domain.Group" resultMap="GroupResult">
         <include refid="selectGroupVo"/>
         <where>
             <if test="groupName != null  and groupName != ''"> and group_name = #{groupName}</if>
diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml
index 271a7f17ced41f2ecdfc41d7bc6142a82d4e3d94..cbbab2471b34ff395e6e22b9e862fdd66b9609e5 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    <select id="selectProductList1" parameterType="com.ruoyi.iot.domain.Product" resultMap="ProductResult">
+    <select id="selectProductListAccurate" parameterType="com.ruoyi.iot.domain.Product" resultMap="ProductResult">
         <include refid="selectProductVo"/>
         <where>
             <if test="productName != null  and productName != ''"> and product_name=#{productName}</if>
diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml
index ad4765016c76ca9f895dc5ff00cab3260f5b4292..7b16170345ecfacd80cff0b3e53d2251177c9a85 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    <select id="selectThingsModelTemplateList1" parameterType="com.ruoyi.iot.domain.ThingsModelTemplate" resultMap="ThingsModelTemplateResult">
+    <select id="selectThingsModelTemplateListAccurate" parameterType="com.ruoyi.iot.domain.ThingsModelTemplate" resultMap="ThingsModelTemplateResult">
         <include refid="selectThingsModelTemplateVo"/>
         <where>
             <if test="templateName != null  and templateName != ''"> and template_name = #{templateName}</if>
diff --git a/vue/src/views/iot/device/product-list.vue b/vue/src/views/iot/device/product-list.vue
index 862c7ce71d1be0fa016ea6e451e32aa36326ce8c..5155595999bdd74f288d5103811f7ba207c63936 100644
--- a/vue/src/views/iot/device/product-list.vue
+++ b/vue/src/views/iot/device/product-list.vue
@@ -96,9 +96,9 @@ export default {
         getList() {
             this.loading = true;
           // 判断是否是admin角色
-          if (this.$store.state.user.roles.indexOf("admin") === -1){
-            this.queryParams.tenantName = this.$store.state.user.name
-          }
+            if (this.$store.state.user.roles.indexOf("admin") === -1){
+              this.queryParams.tenantName = this.$store.state.user.name
+            }
             listProduct(this.queryParams).then(response => {
                 this.productList = response.rows;
                 this.total = response.total;
diff --git a/vue/src/views/iot/group/device-list.vue b/vue/src/views/iot/group/device-list.vue
index 46a64beb2da36d5e805702ae748fd66bf409631a..dea9220e2f3898ea8b11a43c492bf72494f2129a 100644
--- a/vue/src/views/iot/group/device-list.vue
+++ b/vue/src/views/iot/group/device-list.vue
@@ -88,7 +88,7 @@ export default {
             immediate: true
         }
     },
-    created() {  
+    created() {
 
     },
     methods: {
@@ -102,7 +102,7 @@ export default {
         /** 查询设备列表 */
         getList() {
             this.loading = true;
-            this.queryParams.params = {};            
+            this.queryParams.params = {};
             if (null != this.daterangeActiveTime && '' != this.daterangeActiveTime) {
                 this.queryParams.params["beginActiveTime"] = this.daterangeActiveTime[0];
                 this.queryParams.params["endActiveTime"] = this.daterangeActiveTime[1];