修改farmer接口路径

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

@@ -27,7 +27,7 @@ import java.util.Map;
  * @since 2022-08-30
  */
 @RestController
-@RequestMapping("/base-farmer")
+@RequestMapping("/farmer")
 public class BaseFarmerController {
     @Autowired
     private BaseFarmerService baseFarmerService;

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

@@ -3,6 +3,7 @@ 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;
@@ -26,11 +27,18 @@ 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);
+    }
+
 }
 

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

@@ -1,9 +1,11 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,4 +18,6 @@ import java.util.List;
 public interface FarmerAssetService extends IService<FarmerAsset> {
 
     List<FarmerAsset> getLastManyMonthAssets(String farmCode, String manyMonth);
+
+    Result getAssetStatistics(Map<String, Object> paramsMap);
 }

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

@@ -35,7 +35,7 @@ public class BaseFarmerServiceImpl extends ServiceImpl<BaseFarmerMapper, BaseFar
         baseFarmer.setFarmer(paramsMap.get("farmer")+"");
         baseFarmer.setPhone(paramsMap.get("phone")+"");
         baseFarmer.setAddress(paramsMap.get("address")+"");
-        baseFarmer.setFarmCode(paramsMap.get("farmCode")+"");
+        baseFarmer.setFarmCode(paramsMap.get("farmId")+"");
         int rows = baseFarmerMapper.insert(baseFarmer);
         if(rows > 0){
             return new Result(ResultCode.SUCCESS);
@@ -51,7 +51,7 @@ public class BaseFarmerServiceImpl extends ServiceImpl<BaseFarmerMapper, BaseFar
         baseFarmer.setFarmer(paramsMap.get("farmer")+"");
         baseFarmer.setPhone(paramsMap.get("phone")+"");
         baseFarmer.setAddress(paramsMap.get("address")+"");
-        baseFarmer.setFarmCode(paramsMap.get("farmCode")+"");
+//        baseFarmer.setFarmCode(paramsMap.get("farmId")+"");
         int rows = baseFarmerMapper.updateById(baseFarmer);
         if(rows > 0){
             return new Result(ResultCode.SUCCESS);
@@ -79,7 +79,7 @@ public class BaseFarmerServiceImpl extends ServiceImpl<BaseFarmerMapper, BaseFar
     @Override
     public Result list(Map<String, Object> paramsMap) {
         //
-        String farmCode = paramsMap.get("farmCode")+"";
+        String farmCode = paramsMap.get("farmId")+"";
         String farmer = paramsMap.get("farmer")+"";
         Integer pageNo = Integer.parseInt(paramsMap.get("pageNo")+"");
         Integer pageSize = Integer.parseInt(paramsMap.get("pageSize")+"");

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

@@ -1,5 +1,9 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+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.manage2.pojo.EartagAbnormalAlarm;
 import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.huimv.eartag2.manage2.mapper.FarmerAssetMapper;
 import com.huimv.eartag2.manage2.service.FarmerAssetService;
@@ -8,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,4 +32,15 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
         //{}
         return farmerAssetMapper.getLastManyMonthAssets(farmCode,manyMonth);
     }
+
+    @Override
+    public Result getAssetStatistics(Map<String, Object> paramsMap) {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("areaId")+"";
+        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
+        QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code",farmCode);
+
+        return null;
+    }
 }