这是新项目,批量添加

cloud-platform-main/src/main/java/com/huimv/modular/basepigpen/service/BasePigpenService.java

@@ -39,6 +39,14 @@ import java.util.List;
  */
 public interface BasePigpenService extends IService<BasePigpen> {
 
+
+
+
+
+
+
+
+
     /**
      * 查询栋舍表
      *

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

@@ -24,6 +24,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
  */
 package com.huimv.modular.collectorregister.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.core.annotion.BusinessLog;
 import com.huimv.core.annotion.DataScope;
@@ -32,11 +33,15 @@ import com.huimv.core.enums.LogAnnotionOpTypeEnum;
 import com.huimv.core.pojo.response.ErrorResponseData;
 import com.huimv.core.pojo.response.ResponseData;
 import com.huimv.core.pojo.response.SuccessResponseData;
+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.param.CollectorRegisterParam;
 import com.huimv.modular.collectorregister.service.CollectorRegisterService;
 import com.huimv.modular.eartagregister.entity.EartagRegister;
 import com.huimv.modular.eartagregister.service.EartagRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,7 +49,9 @@ 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;
 
 /**
  * 设备管理控制器
@@ -61,6 +68,88 @@ public class CollectorRegisterController {
     @Resource
     private EartagRegisterService eartagRegisterService;
 
+    @Autowired
+    private BasePigpenService basePigpenService;
+
+
+
+
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
+    
+    
+
+    //批量添加采集器----客户接口
+    @PostMapping ("/collectorRegister/addPro")
+    public ResponseData addPro(@RequestBody Map<String, Object> params) {
+        //批量添加 基站
+        String deviceCodeList = (String) params.get("deviceCodeList");  //耳基站号码  不止一个
+        String penName = (String) params.get("penName");
+        String unitName = (String) params.get("unitName");
+        String farmName = (String) params.get("farmName");
+        String farmId = (String) params.get("farmId");
+
+
+        //一进来先添加栋舍   拿到  id  再添加舍
+        BasePigpen basePigpen = new BasePigpen();
+        basePigpen.setFarmCode(farmId); //记录牧场
+        basePigpen.setPigpenName(penName); //记录舍名
+        basePigpen.setType(1);//栋
+        basePigpen.setParentId(0);//栋  阶段啥的全部空着
+        basePigpenService.save(basePigpen);
+
+        //拿最新的id 很麻烦直接查一次
+
+
+        LambdaQueryWrapper<BasePigpen> wrapper = Wrappers.lambdaQuery();
+        wrapper.orderByDesc().last("limit 1");
+        BasePigpen pigpen = basePigpenMapper.selectOne(wrapper);
+
+
+
+        //添加舍得信息
+        BasePigpen basePigpenunit = new BasePigpen();
+        basePigpenunit.setFarmCode(farmId); //记录牧场
+        basePigpenunit.setPigpenName(unitName); //记录舍名
+        basePigpenunit.setType(2);//栋
+        basePigpenunit.setParentId(pigpen.getId());//栋  阶段啥的全部空着
+        basePigpenService.save(basePigpenunit);
+
+
+        LambdaQueryWrapper<BasePigpen> wrapper1 = Wrappers.lambdaQuery();
+        wrapper1.orderByDesc(BasePigpen::getId).last("limit 1");
+        BasePigpen pigpenUnite = basePigpenMapper.selectOne(wrapper1);
+
+        //主从关系直接在这里创建   存到云服务器的只有设备编号  不存在其他的东西  转发IP   我们给他写死就可以了
+
+        String[] as = deviceCodeList.split(",");
+        for (int i = 0; i < as.length; i++) {
+
+            CollectorRegister collectorRegister = new CollectorRegister();
+            collectorRegister.setDeviceCode(as[i]);
+            collectorRegister.setFarmCode(farmId);
+            collectorRegister.setFarmName(farmName);
+            collectorRegister.setRegisterTime(new Date());
+            collectorRegister.setOrgId(123456L);
+            collectorRegister.setPenName(penName);
+            collectorRegister.setUnitName(unitName);
+            collectorRegister.setUnitId(pigpenUnite.getId());
+            collectorRegister.setPigpenId(pigpen.getId());
+            collectorRegister.setPort(6859);
+            collectorRegister.setServerIp("195.125.635.3");
+            collectorRegisterService.save(collectorRegister);
+
+        }
+        SuccessResponseData successResponseData = new SuccessResponseData();
+        successResponseData.setCode(200);
+        successResponseData.setSuccess(true);
+        successResponseData.setMessage("保存成功");
+        return successResponseData;
+    }
+
+
+
+
     /**
      * 查询设备管理
      *

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

@@ -35,8 +35,11 @@ import com.huimv.core.annotion.Permission;
 import com.huimv.core.enums.LogAnnotionOpTypeEnum;
 import com.huimv.core.factory.PageFactory;
 import com.huimv.core.pojo.page.PageResult;
+import com.huimv.core.pojo.response.ErrorResponseData;
 import com.huimv.core.pojo.response.ResponseData;
 import com.huimv.core.pojo.response.SuccessResponseData;
+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.eartagdata.entity.EartagData;
 import com.huimv.modular.eartagdata.entity.vo.EartagDataVo;
@@ -88,6 +91,77 @@ public class EartagRegisterController{
     private EartagDataMapper  eartagDataMapper ;
 
 
+
+
+    @Autowired
+    private CollectorRegisterMapper collectorRegisterMapper ;
+
+
+
+
+
+    //增加增删改查的功能  删除的时候删除所有的耳标：
+    //手动添加的只有三个参数  耳标号   坐标  然后没有了    在上传的时候补齐其余信息  （默认上传次数为1）
+    //所有的事件接口   //批量添加耳标
+    @RequestMapping("/EratagRegister/addPro")
+    public ResponseData addPro(@RequestBody Map<String, Object> params) throws ClientException, ParseException {
+        //入参的统一校验就应该通过 param的统一校验来做  不然重复代码过多啊
+        String eartagNoList = (String) params.get("eartagNoList");  //耳标号
+        String deviceCode = (String) params.get("deviceCode");  //坐标
+        //禁止重复添加耳标号
+        LambdaQueryWrapper<CollectorRegister> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(CollectorRegister::getDeviceCode, deviceCode);
+        CollectorRegister collectorRegister = collectorRegisterMapper.selectOne(wrapper);
+
+        if (collectorRegister == null) {
+            ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，采集器未注册");
+            errorResponseData.setCode(0);
+            
+            return errorResponseData;
+        }
+
+        String[] as = eartagNoList.split(",");
+        for (int i = 0; i < as.length; i++) {
+
+            EartagRegister eartagRegister = new EartagRegister();
+
+            eartagRegister.setDeviceCode(collectorRegister.getDeviceCode());
+            eartagRegister.setFarmCode(collectorRegister.getFarmCode());
+            eartagRegister.setRegisterDate(new Date());
+            eartagRegister.setEartagNo(as[i]);
+            eartagRegister.setOrgId(123456L);
+            eartagRegister.setPigpen(String.valueOf(collectorRegister.getPigpenId()));
+            eartagRegisterService.save(eartagRegister);
+        }
+        
+        
+        SuccessResponseData successResponseData = new SuccessResponseData();
+        successResponseData.setCode(200);
+        successResponseData.setSuccess(true);
+        successResponseData.setMessage("保存成功");
+        return successResponseData;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     //展示注册表中的所有耳标  通过时间来倒序查
    /* {
         "eartagNo": "00010131010",

cloud-platform-main/src/main/resources/application-local.yml

@@ -2,7 +2,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-test1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-cloud-pro1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: root
     password: hm123456
   redis:

cloud-platform-main/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 #服务配置
 server:
-  port: 8256
+  port: 9256
   max-http-header-size: 10240
 
 #spring相关配置  选择哪个配置文件