Merge remote-tracking branch 'origin/master'

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

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

@@ -3,7 +3,6 @@ package com.huimv.eartag2.manage2.controller;
 
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.EartagAbnormalAlarmService;
-import com.huimv.eartag2.manage2.service.FarmerAssetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,18 +26,16 @@ import java.util.Map;
 public class EartagAbnormalAlarmController {
     @Autowired
     private EartagAbnormalAlarmService eartagAbnormalAlarmService;
-    @Autowired
-    private FarmerAssetService farmerAssetService;
 
     @PostMapping("/getEarTemWarning")
     public Result getEarTemWarning(@RequestBody Map<String, Object> paramsMap) throws ParseException {
         return eartagAbnormalAlarmService.getEarTemWarning(paramsMap);
     }
 
-    @PostMapping("/getAssetStatistics")
-    public Result getAssetStatistics(@RequestBody Map<String, Object> paramsMap) throws ParseException {
-        return farmerAssetService.getAssetStatistics(paramsMap);
-    }
 
+    @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/pojo/EartagDeviceRegister.java

@@ -78,5 +78,6 @@ public class EartagDeviceRegister implements Serializable {
 
     private Integer upgrade;
     private Integer farmerId;
+    private String farmerName;
 
 }

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

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm> {
 
     Result getEarTemWarning(Map<String, Object> paramsMap) throws ParseException;
+
+    Result getNewPig(Map<String, String> paramsMap);
 }

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

@@ -1,5 +1,6 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,12 +9,14 @@ import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
 import com.huimv.eartag2.manage2.mapper.EartagAbnormalAlarmMapper;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.service.EartagAbnormalAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
 
@@ -52,4 +55,22 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         }
         return new Result(ResultCode.SUCCESS,newJa);
     }
+
+
+    @Override
+    public Result getNewPig(Map<String, String> paramsMap) {
+        String areaId = paramsMap.get("areaId");
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",areaId);
+
+        Date now = new Date();
+        DateTime beginOfMonth = cn.hutool.core.date.DateUtil.beginOfMonth(now);
+        for (int i = 0 ; i<6 ;i++){
+            beginOfMonth = cn.hutool.core.date.DateUtil.offsetMonth(beginOfMonth,-i);
+            DateTime endOfMonth = cn.hutool.core.date.DateUtil.endOfMonth(beginOfMonth);
+//            eartagEartagRegister2
+        }
+
+        return null;
+    }
 }

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

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
 import com.huimv.eartag2.manage2.mapper.BasePigpenMapper;
 import com.huimv.eartag2.manage2.pojo.BaseFarm;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
 import com.huimv.eartag2.manage2.pojo.BasePigpen;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
@@ -42,6 +44,8 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
 
     @Resource
+    private BaseFarmerMapper baseFarmerMapper;
+    @Resource
     private BasePigpenMapper basePigpenMapper;
 
     @Autowired
@@ -76,9 +80,12 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         for (Map<String, Integer> map : mapList) {
             Integer id = map.get("id");
             Integer farmerId = map.get("farmerId");
+            BaseFarmer baseFarmer = baseFarmerMapper.selectById(farmerId);
+
             EartagDeviceRegister deviceRegister = new EartagDeviceRegister();
             deviceRegister.setId(id);
             deviceRegister.setFarmerId(farmerId);
+            deviceRegister.setFarmerName(baseFarmer.getFarmer());
             eartagDeviceRegisterMapper.updateById(deviceRegister);
         }