From a908ca60a923b9b64f1cd62623e8e1f33030ea1d Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Wed, 15 Jun 2022 16:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=88=E6=9D=83=E7=A0=81?=
 =?UTF-8?q?=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/iot/controller/DeviceController.java    | 11 +++++++++++
 .../src/main/resources/mapper/iot/DeviceMapper.xml    | 10 +++++-----
 2 files changed, 16 insertions(+), 5 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 d2c48a8f..f614d734 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
@@ -119,6 +119,17 @@ public class DeviceController extends BaseController
         return AjaxResult.success(deviceService.selectDeviceByDeviceId(deviceId));
     }
 
+    /**
+     * 根据设备编号详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('iot:device:query')")
+    @GetMapping(value = "/getDeviceBySerialNumber/{serialNumber}")
+    @ApiOperation("根据设备编号获取设备详情")
+    public AjaxResult getInfoBySerialNumber(@PathVariable("serialNumber") String serialNumber)
+    {
+        return AjaxResult.success(deviceService.selectDeviceBySerialNumber(serialNumber));
+    }
+
     /**
      * 获取设备统计信息
      */
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 df34170d..6fae9f62 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -224,6 +224,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where device_id = #{deviceId}
     </select>
 
+    <select id="selectDeviceBySerialNumber" parameterType="String" resultMap="DeviceResult">
+        <include refid="selectDeviceVo"/>
+        where serial_number = #{serialNumber}
+    </select>
+
     <select id="selectDeviceProductAlertCount" parameterType="com.ruoyi.iot.domain.Device" resultType="com.ruoyi.iot.model.DeviceStatistic">
         select
             <!--设备数量-->
@@ -272,11 +277,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             p.product_id = #{productId}
     </select>
 
-    <select id="selectDeviceBySerialNumber" parameterType="String" resultMap="DeviceResult">
-        <include refid="selectDeviceVo"/>
-        where serial_number = #{serialNumber}
-    </select>
-
     <select id="selectShortDeviceBySerialNumber" parameterType="String" resultMap="DeviceResult">
         <include refid="selectWebhookDeviceVo"/>
         where serial_number = #{serialNumber}