From 3043fffea3db16adaea5058a597d0bc9fc28b01d Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Thu, 14 Sep 2023 08:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A11.?=
 =?UTF-8?q?1.7=E7=89=88=E6=9C=AC=20=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/HwDeviceMapper.xml        | 54 +++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
index 3083707..0dee03a 100644
--- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
+++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.HwDeviceMapper">
-
+    
     <resultMap type="HwDevice" id="HwDeviceResult">
         <result property="deviceId"    column="device_id"    />
         <result property="deviceCode"    column="device_code"    />
@@ -32,27 +32,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deviceField"    column="device_field"    />
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="onlineStatus"    column="online_status"    />
     </resultMap>
 
+    <!--以下为监控平台接口所用-->
     <resultMap id="DeviceModeVoResult" type="com.ruoyi.business.domain.VO.DeviceModeVo" >
         <result property="deviceModeName" column="device_mode_name"/>
         <result property="sum" column="sum"/>
         <result property="err" column="err"/>
     </resultMap>
-
-    <sql id="selectHwDeviceVo">
-        select device_id, device_code, device_name, scene_id, monitor_unit_id, device_type, networking_mode, access_protocol, data_format, releated_device_id, device_mode_id, access_gw_protocol, active_status, device_status, active_time, device_pic, ip_address, area_id, device_location, current_module_version, current_singlechip_version, remark, create_by, create_time, update_by, update_time, device_field from hw_device
-    </sql>
-
     <select id="selectDeviceModeNameVo" resultMap="DeviceModeVoResult">
         SELECT b.device_mode_name ,a.sum FROM hw_device_mode b
-LEFT JOIN (SELECT device_mode_id,count(*) as sum FROM hw_device GROUP BY device_mode_id order by sum desc
-) a on a.device_mode_id = b.device_mode_id
+                                                  LEFT JOIN (SELECT device_mode_id,count(*) as sum FROM hw_device GROUP BY device_mode_id order by sum desc
+        ) a on a.device_mode_id = b.device_mode_id
+    </select>
+    <select id="selectDeviceByDeviceModeByDeviceModeFunction" parameterType="Long" resultType="String">
+        select count(*) from hw_device_mode_function where device_mode_id =
+                                                           (SELECT device_mode_id from hw_device where device_id = #{deviceId}) and function_type = '1'
     </select>
-<select id="selectDeviceByDeviceModeByDeviceModeFunction" parameterType="Long" resultType="String">
-    select count(*) from hw_device_mode_function where device_mode_id =
-     (SELECT device_mode_id from hw_device where device_id = #{deviceId}) and function_type = '1'
-</select>
     <select id="selectDeviceModeFunctionByFunctionType" parameterType="Long" resultType="String">
 
     </select>
@@ -62,19 +60,25 @@ LEFT JOIN (SELECT device_mode_id,count(*) as sum FROM hw_device GROUP BY device_
     </select>
     <select id="selectDeviceByMonitorId" parameterType="Long" resultMap="HwDeviceResult">
         <include refid="selectHwDeviceVo"/>
-        from hw_device where monitor_unit_id = #{monitorUnitId}
+        where monitor_unit_id = #{monitorUnitId}
     </select>
     <select id="selectDeviceByDeviceModeBySceneId" parameterType="Long" resultMap="HwDeviceResult">
         select * from hw_device where device_mode_id = (
-SELECT device_mode_id from hw_device_mode where scene_id = #{sceneId} )
+            SELECT device_mode_id from hw_device_mode where scene_id = #{sceneId} )
     </select>
     <select id="selectDeviceByDeviceModeByMonitorUnitId" parameterType="Long" resultMap="HwDeviceResult">
-         select * from hw_device where device_mode_id = (
-SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitId} )
+        select * from hw_device where device_mode_id = (
+            SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitId} )
     </select>
+    <!--以上为监控平台接口所用-->
+
+    <sql id="selectHwDeviceVo">
+        select device_id, device_code, device_name, scene_id, monitor_unit_id, device_type, networking_mode, access_protocol, data_format, releated_device_id, device_mode_id, access_gw_protocol, active_status, device_status, active_time, device_pic, ip_address, area_id, device_location, current_module_version, current_singlechip_version, remark, create_by, create_time, update_by, update_time, device_field, tenant_id, online_status from hw_device
+    </sql>
+
     <select id="selectHwDeviceList" parameterType="HwDevice" resultMap="HwDeviceResult">
         <include refid="selectHwDeviceVo"/>
-        <where>
+        <where>  
             <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="sceneId != null "> and scene_id = #{sceneId}</if>
@@ -96,14 +100,16 @@ SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitI
             <if test="currentModuleVersion != null  and currentModuleVersion != ''"> and current_module_version = #{currentModuleVersion}</if>
             <if test="currentSinglechipVersion != null  and currentSinglechipVersion != ''"> and current_singlechip_version = #{currentSinglechipVersion}</if>
             <if test="deviceField != null  and deviceField != ''"> and device_field = #{deviceField}</if>
+            <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
+            <if test="onlineStatus != null  and onlineStatus != ''"> and online_status = #{onlineStatus}</if>
         </where>
     </select>
-
+    
     <select id="selectHwDeviceByDeviceId" parameterType="Long" resultMap="HwDeviceResult">
         <include refid="selectHwDeviceVo"/>
         where device_id = #{deviceId}
     </select>
-
+        
     <insert id="insertHwDevice" parameterType="HwDevice" useGeneratedKeys="true" keyProperty="deviceId">
         insert into hw_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -133,6 +139,8 @@ SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitI
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="deviceField != null">device_field,</if>
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="onlineStatus != null and onlineStatus != ''">online_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
@@ -161,6 +169,8 @@ SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitI
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="deviceField != null">#{deviceField},</if>
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="onlineStatus != null and onlineStatus != ''">#{onlineStatus},</if>
          </trim>
     </insert>
 
@@ -193,6 +203,8 @@ SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitI
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="deviceField != null">device_field = #{deviceField},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="onlineStatus != null and onlineStatus != ''">online_status = #{onlineStatus},</if>
         </trim>
         where device_id = #{deviceId}
     </update>
@@ -202,9 +214,9 @@ SELECT device_mode_id from hw_device_mode where monitor_unit_id = #{monitorUnitI
     </delete>
 
     <delete id="deleteHwDeviceByDeviceIds" parameterType="String">
-        delete from hw_device where device_id in
+        delete from hw_device where device_id in 
         <foreach item="deviceId" collection="array" open="(" separator="," close=")">
             #{deviceId}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file