From 1d7d9cf45c0ed2688fe4a7cf07847480701e130b Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Fri, 18 Apr 2025 17:16:56 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/model/entity/DeviceProEntity.java  |  2 +-
 .../model/entity/DeviceProUserEntity.java     |  2 +-
 .../resources/mapper/IDeviceProMapper.xml     | 34 +++++++++++--------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProEntity.java
index a7b67f3..2aea7d2 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProEntity.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProEntity.java
@@ -27,7 +27,7 @@ import java.util.List;
 @TableName(value = "manage_device_pro")
 public class DeviceProEntity extends BaseEntity implements Serializable {
 
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     private Integer id;
 
     @TableField(value = "pro_name")
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProUserEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProUserEntity.java
index eed482e..b23ebd2 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProUserEntity.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceProUserEntity.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
 @TableName(value = "manage_device_pro_user")
 public class DeviceProUserEntity extends BaseEntity implements Serializable {
 
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     private Integer id;
 
     @TableField(value = "device_pro_id")
diff --git a/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml b/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml
index d24cd20..ba1fa69 100644
--- a/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml
+++ b/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml
@@ -4,11 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.sample.manage.mapper.IDeviceProMapper">
     <resultMap id="listDeviceProEntityMap" type="org.dromara.sample.manage.model.entity.DeviceProEntity">
-        <result column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="pro_id" property="id" jdbcType="VARCHAR"/>
         <result column="pro_name" property="proName" jdbcType="VARCHAR"/>
         <result column="bind_code" property="bindCode" jdbcType="VARCHAR"/>
         <result column="bind_type" property="bindType" jdbcType="VARCHAR"/>
-        <result column="workspace_id" property="workspaceId" jdbcType="VARCHAR"/>
         <collection property="deviceProUserEntityList" ofType="org.dromara.sample.manage.model.entity.DeviceProUserEntity">
             <result  column="pro_user_id" property="id"/>
             <result  column="device_pro_id" property="deviceProId"/>
@@ -16,47 +15,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result  column="nick_name" property="nickName"/>
         </collection>
         <collection property="deviceEntityList" ofType="org.dromara.sample.manage.model.entity.DeviceEntity">
-            <result column="id" property="id"/>
+            <result column="device_id" property="id"/>
             <result column="device_sn" property="deviceSn"/>
             <result column="device_name" property="deviceName"/>
             <result column="device_type" property="deviceType"/>
             <result column="sub_type" property="subType"/>
             <result column="domain" property="domain"/>
-            <result column="nickname" property="nickname"/>
             <result column="child_sn" property="childSn"/>
+            <result column="workspace_id" property="workspaceId"/>
+            <result column="device_pro_number" property="proId"/>
+            <result column="device_nick_name" property="nickname"/>
         </collection>
     </resultMap>
     <select id="listDeviceProEntityMap" resultMap="listDeviceProEntityMap">
         SELECT
-        dp.*,
-        dpu.user_id,
+        dp.id pro_id,
+        dp.pro_name,
+        dp.bind_code,
+        dp.bind_type,
+        dpu.user_id pro_user_id,
         dpu.device_pro_id,
         dpu.user_id,
         dpu.nick_name,
-        d.id,
+        d.id device_id,
         d.device_sn,
         d.device_name,
         d.device_type,
         d.sub_type,
         d.domain,
-        d.nickname,
-        d.child_sn
+        d.child_sn,
+        d.workspace_id,
+        d.pro_id device_pro_number,
+        d.nickname device_nick_name
         FROM
             manage_device_pro dp
         LEFT JOIN manage_device d ON dp.id = d.pro_id
-        LEFT JOIN manage_device_pro_user dpu ON dp.id = dpu.pro_id
+        LEFT JOIN manage_device_pro_user dpu ON dp.id = dpu.device_pro_id
         <where>
         <if test="condition.deviceSn != null and condition.deviceSn != ''">
-            or d.device_sn like concat(concat('%',#{condition.deviceSn}),'%')
+            and d.device_sn like concat(concat('%',#{condition.deviceSn}),'%')
         </if>
         <if test="condition.deviceName != null and condition.deviceName != ''">
-            or d.device_name like concat(concat('%',#{condition.deviceName}),'%')
+            and d.device_name like concat(concat('%',#{condition.deviceName}),'%')
         </if>
         <if test="condition.nickname != null and condition.nickname != ''">
-            or dpu.nickname like concat(concat('%',#{condition.nickname}),'%')
+            and dpu.nickname like concat(concat('%',#{condition.nickname}),'%')
         </if>
         <if test="condition.userId != null and condition.userId != ''">
-            or dpu.user_id = #{condition.userId}
+            and dpu.user_id = #{condition.userId}
         </if>
         </where>
     </select>