From 39c23389aeededd0e8bb3ed553390740fbadc92c Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 18 Apr 2024 19:14:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../securitycontrol/entity/background/vo/DeviceBdDetailVo.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java
index d35aed6..92114bb 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java
@@ -31,12 +31,10 @@ public class DeviceBdDetailVo {
 
     @ApiModelProperty("最大阈值")
     @Length(max = 50, message = "最大阈值字符长度不能超过50", groups = {Query.class})
-    @Pattern(regexp = "(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))",message = "最大阈值为大于0的数字",groups = {Query.class})
     private String maxValueData;
 
     @ApiModelProperty("最小阈值")
     @Length(max = 50, message = "最小阈值长字符度不能超过50", groups = {Query.class})
-    @Pattern(regexp = "(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))",message = "最小阈值为大于0的数字",groups = {Query.class})
     private String minValueData;
 
     @ApiModelProperty("采集值类型")
@@ -48,7 +46,6 @@ public class DeviceBdDetailVo {
     private String deviceCode;
 
     @ApiModelProperty("采集数据单位")
-    @NotBlank(message = "采集数据单位不能为空", groups = {Query.class})
     @Length(max = 255, message = "采集数据单位字符长度不能超过50", groups = {Query.class})
     private String unit;
 

From bafeea767951531c49e896ed424d81dff9dca6b8 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 18 Apr 2024 19:34:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../background/service/impl/DeviceOfBdServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/DeviceBdMapper.xml           | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
index b5569e8..4ab4b2a 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
@@ -218,7 +218,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
             }
             int result = mapper.isBdDeviceDetailExist(vo);
             if (result > 0) {
-                return AjaxResult.error("检测不能重复");
+                return AjaxResult.error("检测名称不能重复");
             }
             if (StringUtils.isEmpty(vo.getId())) {
                 String id = IdUtils.getuid();
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 43ea6ba..826ed18 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -169,11 +169,7 @@
             </trim>
         </if>
         <if test="type == 2">
-            UPDATE tb_device_value
-            <set>
-                <if test="unit != null and unit != ''">unit = #{unit},</if>
-            </set>
-            WHERE attribute_id = #{id}
+            UPDATE tb_device_value SET unit = #{unit} WHERE attribute_id = #{id}
         </if>
     </insert>
     <!--删除边带设备-->
@@ -274,6 +270,7 @@
                 )
             </if>
         </where>
+        ORDER BY tbd.create_time DESC
     </select>
     <!--边带设备编码是否重复-->
     <select id="isDeviceCodeExist" resultType="java.lang.Integer">

From 26b19ad41309a74aeeb0b3999e81118c22afd1bf Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 18 Apr 2024 19:40:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DeviceBdMapper.xml                 | 1 +
 1 file changed, 1 insertion(+)

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 826ed18..5d52063 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -218,6 +218,7 @@
                 )
             </if>
         </where>
+        ORDER BY tpb.bind_time DESC,tpb.create_time DESC
     </select>
     <!--边带编码是否重复-->
     <select id="isBdCodeExist" resultType="java.lang.Integer">