采集器添加修改7

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDeviceRegisterServiceImpl.java

@@ -219,6 +219,14 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("chip_id", chipId);
             EartagDeviceRegister eartagDeviceRegister1 = eartagDeviceRegisterMapper.selectOne(queryWrapper);
+
+            QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("device_code", deviceCode);
+            EartagDeviceRegister eartagDeviceRegister2 = eartagDeviceRegisterMapper.selectOne(queryWrapper1);
+            if (ObjectUtil.isNotEmpty(eartagDeviceRegister2)) {
+                return new Result(10001, "设备编码已存在！", false);
+            }
+
             if (ObjectUtil.isEmpty(eartagDeviceRegister1)) {
                 eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
                 //{设置芯片ID和设备编码缓存}
@@ -226,7 +234,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
                 System.out.println("1 设置芯片和设备编码缓存,chipId=" + chipId + ",deviceCode=" + deviceCode);
                 return resultUtil.result(1);
             } else {
-                return resultUtil.result(0);
+                return new Result(10001, "采集器编码已存在！", false);
             }
 
         }else {
@@ -244,6 +252,14 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("chip_id", chipId);
             EartagDeviceRegister eartagDeviceRegister1 = eartagDeviceRegisterMapper.selectOne(queryWrapper);
+
+            QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("device_code", deviceCode);
+            EartagDeviceRegister eartagDeviceRegister2 = eartagDeviceRegisterMapper.selectOne(queryWrapper1);
+            if (ObjectUtil.isNotEmpty(eartagDeviceRegister2)) {
+                return new Result(10001, "设备编码已存在！", false);
+            }
+
             if (ObjectUtil.isEmpty(eartagDeviceRegister1)) {
                 eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
                 //{设置芯片ID和设备编码}
@@ -251,7 +267,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
                 System.out.println("2 设置芯片和设备编码缓存,chipId=" + chipId + ",deviceCode=" + deviceCode);
                 return resultUtil.result(1);
             } else {
-                return resultUtil.result(0);
+                return new Result(10001, "配标器编码已存在！", false);
             }
 
         }