【feat】 设置领养人

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BaseFarmerController.java

@@ -54,7 +54,7 @@ public class BaseFarmerController {
     }
     @PostMapping("/listAll")
     public Result listAll(@RequestBody Map<String, String> paramsMap) {
-        String farmCode = paramsMap.get("farmCode");
+        String farmCode = paramsMap.get("farmId");
 
         return new Result(ResultCode.SUCCESS, baseFarmerService.list(new QueryWrapper<BaseFarmer>().eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode)));
     }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagAbnormalAlarmController.java

@@ -34,8 +34,13 @@ public class EartagAbnormalAlarmController {
 
 
     @PostMapping("/getNewPig")
-    public Result getNewPig(@RequestBody Map<String, String> paramsMap) throws ParseException {
+    public Result getNewPig(@RequestBody Map<String, String> paramsMap) {
         return eartagAbnormalAlarmService.getNewPig(paramsMap);
     }
+
+    @PostMapping("/listFarmer")
+    public Result listFarmer(@RequestBody Map<String, String> paramsMap) {
+        return eartagAbnormalAlarmService.listFarmer(paramsMap);
+    }
 }
 

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

@@ -20,4 +20,6 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
     Result getEarTemWarning(Map<String, Object> paramsMap) throws ParseException;
 
     Result getNewPig(Map<String, String> paramsMap);
+
+    Result listFarmer(Map<String, String> paramsMap);
 }

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

@@ -1,12 +1,18 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.BaseFarmMapper;
+import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
+import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
+import com.huimv.eartag2.manage2.pojo.BaseFarm;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
 import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
 import com.huimv.eartag2.manage2.mapper.EartagAbnormalAlarmMapper;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
@@ -16,9 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -55,22 +59,76 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         }
         return new Result(ResultCode.SUCCESS,newJa);
     }
+    @Autowired
+    private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
+
+    @Autowired
+    private BaseFarmerMapper baseFarmerMapper;
+
+    @Autowired
+    private BaseFarmMapper baseFarmMapper;
 
 
     @Override
     public Result getNewPig(Map<String, String> paramsMap) {
         String areaId = paramsMap.get("areaId");
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id",areaId);
 
+        List endList = new ArrayList();
         Date now = new Date();
-        DateTime beginOfMonth = cn.hutool.core.date.DateUtil.beginOfMonth(now);
+
         for (int i = 0 ; i<6 ;i++){
+            DateTime beginOfMonth = cn.hutool.core.date.DateUtil.beginOfMonth(now);
+            wrapper.clear();
+            wrapper.eq("farm_id",areaId);
+
             beginOfMonth = cn.hutool.core.date.DateUtil.offsetMonth(beginOfMonth,-i);
             DateTime endOfMonth = cn.hutool.core.date.DateUtil.endOfMonth(beginOfMonth);
-//            eartagEartagRegister2
+            wrapper.between("first_time",beginOfMonth,endOfMonth);
+            Long release = eartagEartagRegister2Mapper.selectCount(wrapper);
+            wrapper.clear();
+            wrapper.eq("farm_id",areaId);
+            wrapper.between("first_time",cn.hutool.core.date.DateUtil.offsetMonth(beginOfMonth,-6),cn.hutool.core.date.DateUtil.offsetMonth(endOfMonth,-6));
+            Long slaughter = eartagEartagRegister2Mapper.selectCount(wrapper);
+
+            Map map  = new HashMap();
+            map.put("release",release);
+            map.put("slaughter",slaughter);
+            map.put("month",(cn.hutool.core.date.DateUtil.month(beginOfMonth) +1) +"月");
+            endList.add(map);
+
+
         }
 
-        return null;
+        return new Result(ResultCode.SUCCESS,endList);
     }
+
+    @Override
+    public Result listFarmer(Map<String, String> paramsMap) {
+        List<BaseFarmer> farmers = baseFarmerMapper.selectList(null);
+        List endList = new ArrayList<>();
+        for (BaseFarmer farmer : farmers) {
+            BaseFarm baseFarm = baseFarmMapper.selectOne(new QueryWrapper<BaseFarm>().eq("farm_code", farmer.getFarmCode()));
+
+            Map map  = new HashMap();
+            map.put("farmCode",farmer.getFarmCode());
+            map.put("farmerName",farmer.getFarmer());
+            map.put("id",farmer.getId());
+            if(ObjectUtil.isNotEmpty(baseFarm)){
+
+                map.put("areaCode",baseFarm.getAreaCode());
+                map.put("farmName",baseFarm.getFarmName());
+            }else {
+                map.put("areaCode","");
+                map.put("farmName","");
+            }
+
+
+            endList.add(map);
+
+        }
+        return new Result(ResultCode.SUCCESS,endList);
+    }
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -111,7 +112,17 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         if (StringUtils.isBlank(pageSize)){
             pageSize="20";
         }
+        Map map = new HashMap();
         List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(new QueryWrapper<EartagDeviceRegister>().eq("farmer_id", farmerId));
+        if (ObjectUtil.isEmpty(eartagDeviceRegisters) || eartagDeviceRegisters.size() == 0){
+            map.put("countOff",0);
+            map.put("countOn",0);
+            map.put("countAll",0);
+            map.put("maxEarTemp",0);
+            map.put("minEarTemp",0);
+            map.put("page",new Page<EartagEartagRegister2>());
+            return new Result(ResultCode.SUCCESS,map);
+        }
         List farmerIds = new ArrayList();
         for (EartagDeviceRegister eartagDeviceRegister : eartagDeviceRegisters) {
             farmerIds.add(eartagDeviceRegister.getDeviceCode());
@@ -132,7 +143,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
 
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
 
-        Map map = new HashMap();
+
         long allCount = this.count(wrapper);
 
         //在线

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/vo/EartagDeviceRegisterVo.java

@@ -45,7 +45,8 @@ public class EartagDeviceRegisterVo implements Serializable {
 
     //栋舍名称
     private String pigpenName;
-
+    private Integer farmerId;
+    private String farmerName;
 
 
 }