From 224d4e1f7e1107cce0bf60e93aa41c43e184ee9d Mon Sep 17 00:00:00 2001
From: hp <2854995195@qq.com>
Date: Wed, 27 Apr 2022 18:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8Asql=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/controller/DeviceController.java      |  4 +--
 .../resources/mapper/iot/DeviceMapper.xml     | 30 +++++++------------
 vue/src/store/modules/user.js                 |  4 +++
 vue/src/views/iot/device/device-user.vue      |  3 +-
 vue/src/views/iot/device/index.vue            |  2 +-
 5 files changed, 20 insertions(+), 23 deletions(-)

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 34f9a80a..a68b3a2c 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
@@ -45,7 +45,7 @@ public class DeviceController extends BaseController
     {
         startPage();
         List<Device> list = new ArrayList<>();
-        if(device.getUserName()==null || device.getUserName()=="" )
+        if(device.getUserId() == null)
         {
             list = deviceService.selectDeviceList(device);
         }else {
@@ -65,7 +65,7 @@ public class DeviceController extends BaseController
     {
         startPage();
         List<DeviceShortOutput> list = new ArrayList<>();
-        if(device.getUserName()==null || device.getUserName()=="" )
+        if(device.getUserId() == null)
         {
             list = deviceService.selectDeviceShortList(device);
         }else {
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 7f16e5f9..9e6a7ff3 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -167,10 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="productId != null "> and product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="userId != null ">
-             and user_id = #{userId}
-             or device_id in (select device_id from iot_device_user where iot_device_user.user_name = #{userName})
-            </if>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
             <if test="tenantName != null  and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
@@ -180,24 +177,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
+
     <select id="selectDeviceShortListAccurate" parameterType="com.ruoyi.iot.domain.Device" resultMap="DeviceShortResult">
-        <include refid="selectDeviceShortVo"/>
+        select device.device_id, device.device_name, device.product_id, device.product_name,
+            device.user_id, device.user_name, device.tenant_id, device.tenant_name, device.serial_number,
+            device.firmware_version, device.status,device.rssi,device.is_shadow ,device.is_custom_location,
+            device.things_model_value, device.active_time,img_url
+
+        from iot_device_user device_user
+        inner join iot_device device on device_user.device_id = device.device_id
         <where>
-            <if test="deviceName != null  and deviceName != ''"> and device_name = #{deviceName}</if>
-            <if test="productId != null "> and product_id = #{productId}</if>
-            <if test="productName != null  and productName != ''"> and product_name = #{productName}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''">
-             and user_name = #{userName}
-             or device_id in (select device_id from iot_device_user where iot_device_user.user_name = #{userName})
-             </if>
-            <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
-            <if test="tenantName != null  and tenantName != ''"> and tenant_name=#{tenantName}</if>
-            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="params.beginActiveTime != null and params.beginActiveTime != '' and params.endActiveTime != null and params.endActiveTime != ''"> and active_time between #{params.beginActiveTime} and #{params.endActiveTime}</if>
+            <if test="userId != null  and userId != ''"> and device_user.user_id = #{userId} </if>
         </where>
-        order by create_time desc
+        order by device.create_time desc
     </select>
     
     <select id="selectDeviceByDeviceId" parameterType="Long" resultMap="DeviceResult">
diff --git a/vue/src/store/modules/user.js b/vue/src/store/modules/user.js
index bf95f104..a39a2ef3 100644
--- a/vue/src/store/modules/user.js
+++ b/vue/src/store/modules/user.js
@@ -18,6 +18,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -94,6 +97,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERID', user.userId)
           resolve(res)
         }).catch(error => {
           reject(error)
diff --git a/vue/src/views/iot/device/device-user.vue b/vue/src/views/iot/device/device-user.vue
index 6c7de24a..116415c3 100644
--- a/vue/src/views/iot/device/device-user.vue
+++ b/vue/src/views/iot/device/device-user.vue
@@ -112,6 +112,7 @@ export default {
                 pageSize: 10,
                 deviceName: null,
                 userName: null,
+                userId: null,
                 tenantName: null,
                 isOwner: null,
             },
@@ -238,7 +239,7 @@ export default {
             // 获取设备列表
             // 判断是否是admin角色
             if (this.$store.state.user.roles.indexOf("admin") === -1) {
-                this.queryParams.userName = this.$store.state.user.name
+                this.queryParams.userId = this.$store.state.user.userId
             }
             listDeviceShort(this.queryParams).then(response => {
                 let deviceList = response.rows;
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index 1c303916..6c0ac155 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -452,7 +452,7 @@ export default {
             }
             // 判断是否是admin角色
             if (this.$store.state.user.roles.indexOf("admin") === -1) {
-                this.queryParams.userName = this.$store.state.user.name
+                this.queryParams.userId = this.$store.state.user.userId
             }
             listDeviceShort(this.queryParams).then(response => {
                 this.deviceList = response.rows;