【feat】 设置领养人

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

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

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

@@ -21,5 +21,5 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
 
     Result getNewPig(Map<String, String> paramsMap);
 
-    Result listFarmer(Map<String, String> paramsMap);
+    Result listFarmer();
 }

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

@@ -104,7 +104,7 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
     }
 
     @Override
-    public Result listFarmer(Map<String, String> paramsMap) {
+    public Result listFarmer() {
         List<BaseFarmer> farmers = baseFarmerMapper.selectList(null);
         List endList = new ArrayList<>();
         for (BaseFarmer farmer : farmers) {

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

@@ -90,6 +90,28 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
         }
 
     }
+    // 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);
+    //            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);
+    //
+    //
+    //        }
 
     //{读取最后一批猪信息}
     private JSONObject _getlastBatchAdoptPig(String deviceCode) throws ParseException {