添加修改

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

@@ -206,6 +206,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             String deviceStatus = mapList.get("deviceStatus");
             String remark = mapList.get("remark");
             String deviceCode = (String)getDeviceCode(farmId).getData();
+            System.out.println(deviceCode);
             EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
             eartagDeviceRegister.setChipId(chipId);
             eartagDeviceRegister.setDeviceAlias(deviceAlias);
@@ -220,12 +221,12 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             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);
-            }
+//            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);
@@ -253,12 +254,12 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             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);
-            }
+//            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);