这是新项目，重复的耳标号 基站号码无法添加

cloud-platform-main/src/main/java/com/huimv/modular/collectorregister/controller/CollectorRegisterController.java

@@ -37,6 +37,7 @@ import com.huimv.modular.basepigpen.entity.BasePigpen;
 import com.huimv.modular.basepigpen.mapper.BasePigpenMapper;
 import com.huimv.modular.basepigpen.service.BasePigpenService;
 import com.huimv.modular.collectorregister.entity.CollectorRegister;
+import com.huimv.modular.collectorregister.mapper.CollectorRegisterMapper;
 import com.huimv.modular.collectorregister.param.CollectorRegisterParam;
 import com.huimv.modular.collectorregister.service.CollectorRegisterService;
 import com.huimv.modular.eartagregister.entity.EartagRegister;
@@ -48,10 +49,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 设备管理控制器
@@ -71,7 +69,8 @@ public class CollectorRegisterController {
     @Autowired
     private BasePigpenService basePigpenService;
 
-
+    @Autowired
+    private CollectorRegisterMapper collectorRegisterMapper;
 
 
     @Autowired
@@ -123,6 +122,24 @@ public class CollectorRegisterController {
         //主从关系直接在这里创建   存到云服务器的只有设备编号  不存在其他的东西  转发IP   我们给他写死就可以了
 
         String[] as = deviceCodeList.split(",");
+
+        LambdaQueryWrapper<CollectorRegister> wrapper13 = Wrappers.lambdaQuery();
+        wrapper13.in(CollectorRegister::getDeviceCode ,   as);
+        List<CollectorRegister> collectorRegisters = collectorRegisterMapper.selectList(wrapper13);
+
+        if(collectorRegisters.size()!=0) {
+            List<String> devideCodes = new ArrayList<>();
+            for (CollectorRegister collectorRegister : collectorRegisters) {
+                devideCodes.add(collectorRegister.getDeviceCode());
+            }
+
+
+             ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，基站编码存在重复,重复编码为 "+devideCodes);
+            return errorResponseData;
+         }
+
+
+
         for (int i = 0; i < as.length; i++) {
 
             CollectorRegister collectorRegister = new CollectorRegister();

cloud-platform-main/src/main/java/com/huimv/modular/eartagregister/controller/EartagRegisterController.java

@@ -65,6 +65,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.xml.transform.Source;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -115,15 +116,27 @@ public class EartagRegisterController{
         if (collectorRegister == null) {
             ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，采集器未注册");
             errorResponseData.setCode(0);
-            
             return errorResponseData;
         }
 
         String[] as = eartagNoList.split(",");
+
+        LambdaQueryWrapper<EartagRegister> wrapper13 = Wrappers.lambdaQuery();
+        wrapper13.in(EartagRegister::getEartagNo ,   as);
+        List<EartagRegister> eartagRegisters = eartagRegisterMapper.selectList(wrapper13);
+        if(eartagRegisters.size()!=0) {
+            List<String> eartagRegiste = new ArrayList<>();
+            for ( EartagRegister eartagRegister : eartagRegisters) {
+                eartagRegiste.add(eartagRegister.getDeviceCode());
+            }
+            ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，耳标存在重复,重复编码为 "+eartagRegiste);
+            return errorResponseData;
+        }
+
+
         for (int i = 0; i < as.length; i++) {
 
             EartagRegister eartagRegister = new EartagRegister();
-
             eartagRegister.setDeviceCode(collectorRegister.getDeviceCode());
             eartagRegister.setFarmCode(collectorRegister.getFarmCode());
             eartagRegister.setRegisterDate(new Date());

cloud-platform-main/src/main/java/com/huimv/modular/timer/tasks/UpdateEartagRegirterDetailsInfo.java

@@ -46,19 +46,19 @@ public class UpdateEartagRegirterDetailsInfo {
         System.out.println("更新耳标注册基础信息");
 
 
-      /* for (int i = 1; i <= 15; i++) {
+     /*  for (int i = 13; i <= 20; i++) {
 
             for (int j = 1; j <= 100; j++) {
                 EartagRegister eartagRegister1 = new EartagRegister();
                 eartagRegister1.setLocation(i + "--" + j);
-                eartagRegister1.setEartagNo("1330831236");
+                eartagRegister1.setEartagNo("13308312361");
                 eartagRegister1.setOrgId(123456124L);
                 eartagRegister1.setRegisterDate(new Date());
                 eartagRegisterService.save(eartagRegister1);
                 System.out.println("存储" + i + "--" + j);
             }
-        }*/
-
+        }
+*/
 
         LambdaQueryWrapper<EartagRegister> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(EartagRegister::getDeviceCode, null);