添加了查询每个type的猪有多少的接口

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BasePigpenController.java

@@ -48,12 +48,17 @@ public class BasePigpenController {
         basePigpen.setFarmCode(farmId+"");
 
         BaseFarmInfo byId = baseFarmInfoService.getById(farmId);
-
+        basePigpen.setFarmName(byId.getFarmName());
         basePigpen.setTypeF(byId.getType());
         basePigpenService.save(basePigpen);
+
         return new Result(10000,"添加成功",true);
     }
 
+
+
+
+
     @PostMapping("/update")
     public Result update(@RequestBody BasePigpen basePigpen){
 
@@ -78,23 +83,12 @@ public class BasePigpenController {
 
     
     
+    
 
     @PostMapping("/page")
     public Result page(@RequestBody Map map){
         //嵌套牧场
-        /*List<Integer> farmIds = new ArrayList<>();
-
-        Integer userId = TokenSign.getMemberIdByJwtToken(request);
-        if (userId == 1){
-            List<BaseFarmInfo> list = baseFarmInfoService.list();
-            for (BaseFarmInfo baseFarmInfo : list) {
-                farmIds.add(baseFarmInfo.getId());
-            }
-        }else {
-            String farmId = TokenSign.getFarmIds(request);
-            farmIds= Arrays.stream(farmId.split(",")).map(Integer::parseInt).collect(Collectors.toList());
-        }*/
-
+        /*nnnnnnnnnnn*/
         return basePigpenService.pageAll(map);
 
     }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BizSellPigRemoveController.java

@@ -64,6 +64,25 @@ public class BizSellPigRemoveController {
         return new Result(10000,"排除成功",true);
     }
 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 
 
     @Transactional

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/CollectorRegisterController.java

@@ -52,7 +52,7 @@ public class CollectorRegisterController {
      //首先需要拿token   拿到token  同步到云服务
         RestTemplate restTemplate = new RestTemplate();
         //这个后面粗腰换的拉
-        String url = "http://47.98.40.154:8256/login";
+        String url = "http://122.112.224.199:8256/login";
         //请求参数JOSN类型
         JSONObject postData = new JSONObject();
         postData.put("account", "admin");
@@ -86,17 +86,24 @@ public class CollectorRegisterController {
         requestBody.put("unitName", collectorRegister.getUnitName());
         HttpEntity<Map<String, Object>> httpEntity = new HttpEntity<>(requestBody, headers);
 
-        String body = restTemplate.postForEntity("http://47.98.40.154:8256/collectorRegister/add", httpEntity, String.class).getBody();
+        String body = restTemplate.postForEntity("http://122.112.224.199:8256/collectorRegister/add", httpEntity, String.class).getBody();
         System.out.println(body);
         //Integer userId = TokenSign.getMemberIdByJwtToken(request);
 
         collectorRegister.setRegisterTime(new Date());
         collectorRegisterService.save(collectorRegister);
         return new Result(10000,"添加成功",true);
+
     }
 
 
 
+
+
+
+
+
+
     //删除可以不用同步的 实际上
     @PostMapping("/delete")
     public Result delete(@RequestBody     List<Integer> ids) {

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/EartagDataController.java

@@ -1,11 +1,22 @@
 package com.huimv.eartag.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.BaseFarmInfo;
+import com.huimv.eartag.entity.EartagData;
+import com.huimv.eartag.entity.EartagRegisterEntity;
+import com.huimv.eartag.entity.vo.PigCountInfo;
+import com.huimv.eartag.mapper.BaseFarmInfoMapper;
+import com.huimv.eartag.mapper.EartagRegisterMapper;
 import com.huimv.eartag.service.IEartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,6 +33,104 @@ public class EartagDataController {
     @Autowired
     private IEartagDataService eartagDataService;
 
+    @Autowired
+    private BaseFarmInfoMapper baseFarmInfoMapper ;
+
+
+
+    @Autowired
+    private EartagRegisterMapper  eartagRegisterMapper ;
+
+
+    //展示不同公司的猪的数量
+
+    @PostMapping("/getPigCount")
+    public Result getPigCount(@RequestBody Map<String,Object>   params ){
+        //传了就是牧场。不传就是管理员
+
+        //searchType=1   养殖     2.检疫   3.屠宰
+        Integer searchType = (Integer)params.get("searchType");
+        
+        List<PigCountInfo>  pigCount = new ArrayList<>();
+
+        //管理员
+        List<BaseFarmInfo> baseFarmInfos = baseFarmInfoMapper.selectList(null);
+
+
+
+        for (BaseFarmInfo baseFarmInfo : baseFarmInfos) {
+            //屠宰的
+           if(baseFarmInfo.getType()==1) {
+               QueryWrapper<EartagRegisterEntity> queryWrapper = new QueryWrapper<>();
+               //第一次上传是谁的基站就是谁的耳标
+               queryWrapper.eq("butcher_id", baseFarmInfo.getId());
+               List<EartagRegisterEntity> eartagRegisterEntities = eartagRegisterMapper.selectList(queryWrapper);
+
+               PigCountInfo pigCountInfo = new PigCountInfo();
+               pigCountInfo.setCount(eartagRegisterEntities.size());
+               pigCountInfo.setFarmId(baseFarmInfo.getId());
+               pigCountInfo.setFarmName(baseFarmInfo.getFarmName());
+               pigCountInfo.setType(baseFarmInfo.getType());
+               pigCount.add(pigCountInfo);
+
+           }
+
+            //养殖
+            if(baseFarmInfo.getType()==2) {
+                QueryWrapper<EartagRegisterEntity> queryWrapper = new QueryWrapper<>();
+                //第一次上传是谁的基站就是谁的耳标
+                queryWrapper.eq("farm_code", baseFarmInfo.getId());
+                List<EartagRegisterEntity> eartagRegisterEntities = eartagRegisterMapper.selectList(queryWrapper);
+                PigCountInfo pigCountInfo = new PigCountInfo();
+                pigCountInfo.setCount(eartagRegisterEntities.size());
+                pigCountInfo.setFarmId(baseFarmInfo.getId());
+                pigCountInfo.setFarmName(baseFarmInfo.getFarmName());
+                pigCountInfo.setType(baseFarmInfo.getType());
+                pigCount.add(pigCountInfo);
+
+            }
+
+            //检疫
+            if(baseFarmInfo.getType()==3) {
+                QueryWrapper<EartagRegisterEntity> queryWrapper = new QueryWrapper<>();
+                //第一次上传是谁的基站就是谁的耳标
+                queryWrapper.eq("inspec_id", baseFarmInfo.getId());
+                List<EartagRegisterEntity> eartagRegisterEntities = eartagRegisterMapper.selectList(queryWrapper);
+                PigCountInfo pigCountInfo = new PigCountInfo();
+                pigCountInfo.setCount(eartagRegisterEntities.size());
+                pigCountInfo.setFarmId(baseFarmInfo.getId());
+                pigCountInfo.setFarmName(baseFarmInfo.getFarmName());
+                pigCountInfo.setType(baseFarmInfo.getType());
+                pigCount.add(pigCountInfo);
+            }
+
+
+        }
+          List<PigCountInfo>  resultInfo  = new ArrayList<>();
+
+        for (PigCountInfo pigCountInfo :   pigCount) {
+            if(pigCountInfo.getType()==searchType){
+                resultInfo.add(pigCountInfo);
+            }
+
+        }
+        return new Result(ResultCode.SUCCESS, resultInfo);
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     @PostMapping("/getTemp")
     public Result getTemp(@RequestBody Map<String,String> map){
         return eartagDataService.getTemp(map);
@@ -36,4 +145,5 @@ public class EartagDataController {
 
 
 
+
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BasePigpen.java

@@ -54,7 +54,9 @@ public class BasePigpen extends Model {
     private Integer creatUser;
 
     private String farmName;
+    
     private Integer farmId;
-
+    
+   
 
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/vo/PigCountInfo.java

@@ -0,0 +1,29 @@
+package com.huimv.eartag.entity.vo;
+
+
+import lombok.Data;
+
+@Data
+/**
+ * 猪只统计信息  就是牧场有多少猪还在
+ */
+public class PigCountInfo {
+
+
+        //牧场ID
+        private   Integer  farmId;
+         //统计的猪只总数
+        private   Integer  count;
+
+        private   String  farmName;
+        
+       private   Integer    type;
+
+
+
+
+
+
+
+
+}