From 06c42e5df8f61ea1d6f631e9f77823e101d02b3f Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 3 Apr 2024 15:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E8=AE=BE=E5=A4=87=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java
index 1278c03..dc83b51 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java
@@ -167,7 +167,7 @@ public interface IDeviceOfBdMapper {
     List<DeviceBdDetailVo> getDeviceBdChildDetailList(DeviceBdDto dto);
 
     /**
-     * 设备级联编码 是否存在
+     * 检测名称 是否存在
      *
      * @param vo
      * @return int
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 8a716a7..aaf5fa2 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
@@ -216,6 +216,10 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
             if (StringUtils.isNotBlank(validResult)) {
                 return AjaxResult.error(validResult);
             }
+            int result = mapper.isBdDeviceDetailExist(vo);
+            if (result > 0) {
+                return AjaxResult.error("检测不能重复");
+            }
             if (StringUtils.isEmpty(vo.getId())) {
                 String id = IdUtils.getUUId();
                 vo.setId(id);
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 46b4c3c..43ea6ba 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -321,10 +321,10 @@
     <!--设备级联编码 是否存在-->
     <select id="isBdDeviceDetailExist" resultType="java.lang.Integer">
         <if test="id == null or id == ''">
-            SELECT COUNT(*) FROM tb_device_detail tdd WHERE device_id = #{deviceId} AND device_code = #{deviceCode} AND del_flag = 0
+            SELECT COUNT(*) FROM tb_device_detail tdd WHERE device_id = #{deviceId} AND mode_name = #{modeName} AND del_flag = 0
         </if>
         <if test="id != null and id != ''">
-            SELECT COUNT(*) FROM tb_device_detail tdd WHERE device_id = #{deviceId} AND device_code = #{deviceCode} AND id != #{id} AND del_flag = 0
+            SELECT COUNT(*) FROM tb_device_detail tdd WHERE device_id = #{deviceId} AND mode_name = #{modeName} AND id != #{id} AND del_flag = 0
         </if>
     </select>
     <!--边带子设备详情数据-->