From e3b0fb567b73a614a334240800bb96f2cc234935 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 2 Apr 2024 16:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E5=AD=90=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/background/vo/DeviceBdChildVo.java       |  8 +++-----
 .../src/main/resources/mapper/DeviceBdMapper.xml    | 13 ++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java
index a3d185a..e458426 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java
@@ -35,11 +35,9 @@ public class DeviceBdChildVo {
     @Length(max = 10, message = "设备状态字符长度不能超过10", groups = {Query.class})
     private String status;
 
-    @ApiModelProperty(value = "设备网络")
-    @NotBlank(message = "设备网络不能为空", groups = {Query.class})
-    @Length(max = 20, message = "设备网络字符长度不能超过20", groups = {Query.class})
-    @Pattern(regexp = "((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)",message = "设备网络格式不正确",groups = {Query.class})
-    private String ip;
+    @ApiModelProperty(value = "设备编码-边带设备id")
+    @Length(max = 80, message = "设备网络字符长度不能超过80", groups = {Query.class})
+    private String bdCode;
 
     @ApiModelProperty(value = "设备名称")
     @NotBlank(message = "设备名称不能为空", groups = {Query.class})
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
index 01c0267..d29faec 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -58,7 +58,7 @@
                 <if test="deviceCode != null and deviceCode!=''">device_code,</if>
                 <if test="deviceType != null and deviceType!=''">devic_type,</if>
                 <if test="status != null and status!=''">status,</if>
-                <if test="ip != null and ip!=''">ip,</if>
+                <if test="bdCode != null and bdCode!=''">bd_code,</if>
                 <if test="deviceName != null and deviceName!=''">device_name,</if>
                 <if test="createTime != null and createTime!=''">create_time,</if>
                 <if test="updateTime != null and updateTime!=''">update_time,</if>
@@ -73,7 +73,7 @@
                 <if test="deviceCode != null and deviceCode!=''">#{deviceCode},</if>
                 <if test="deviceType != null and deviceType!=''">#{deviceType},</if>
                 <if test="status != null and status!=''">#{status},</if>
-                <if test="ip != null and ip != ''">#{ip},</if>
+                <if test="bdCode != null and bdCode != ''">#{bdCode},</if>
                 <if test="deviceName != null and deviceName!=''">#{deviceName},</if>
                 <if test="createTime != null and createTime!=''">#{createTime},</if>
                 <if test="updateTime != null and updateTime!=''">#{updateTime},</if>
@@ -90,7 +90,7 @@
                 <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
                 <if test="deviceType != null and deviceType != ''">devic_type = #{deviceType},</if>
                 <if test="status != null and status != ''">status = #{status},</if>
-                <if test="ip != null and ip != ''">ip = #{ip},</if>
+                <if test="bdCode != null and bdCode != ''">bd_code = #{bdCode},</if>
                 <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
                 <if test="updateTime != null and updateTime != ''">update_time = #{updateTime},</if>
                 <if test="deviceModel != null and deviceModel != ''">device_model = #{deviceModel},</if>
@@ -190,15 +190,14 @@
                tbd.update_time AS updateTime,
                tbd.device_model AS deviceModel,
                tbd.device_code AS deviceCode,
-               sd2.dict_name AS status,
-               tbd.ip,
+               CASE tbd.status WHEN '1' THEN '在线' WHEN '0' THEN '离线' END AS status,
+               tbd.bd_code AS bdCode,
                sd.dict_name AS deviceType,
                sa.area_name AS areaName,
                tbd.bd_id AS bdId
         FROM tb_bd_device tbd
         LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
         LEFT JOIN sys_dict sd ON sd.dict_code = tbd.devic_type
-        LEFT JOIN sys_dict sd2 ON sd2.dict_code = tbd.status
         LEFT JOIN tb_area sa ON tbd.area_id = sa.area_id
         <where>
             tbd.del_flag= 0
@@ -225,7 +224,7 @@
                tbd.update_time AS updateTime,
                tbd.device_model AS deviceModel,
                tbd.device_code AS deviceCode,
-               tbd.ip,
+               tbd.bd_code AS bdCode,
                tbd.bd_id AS bdId,
                tbd.area_id AS areaId,
                tbd.devic_type AS deviceType,