修改养殖分布 补贴统计 生产规模

huimv-cattle/src/main/java/com/huimv/cattle/controller/FarmKindCountController.java

@@ -6,6 +6,7 @@ import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -24,13 +25,13 @@ public class FarmKindCountController {
     private FarmKindCountService farmKindCountService;
 
     @PostMapping("/getFarmKindCount")
-    public Result getFarmKindCount(){
-        return farmKindCountService.getFarmKindCount();
+    public Result getFarmKindCount(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return farmKindCountService.getFarmKindCount(request,paramsMap);
     }
 
     @PostMapping("/saveFarmKindCount")
-    public Result saveFarmKindCount(@RequestBody Map<String,String> paramsMap){
-        return farmKindCountService.saveFarmKindCount(paramsMap);
+    public Result saveFarmKindCount(HttpServletRequest request, @RequestBody Map<String,String> paramsMap){
+        return farmKindCountService.saveFarmKindCount(request,paramsMap);
     }
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/controller/ProductionCapacityController.java

@@ -6,6 +6,7 @@ import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -24,13 +25,13 @@ public class ProductionCapacityController {
     private ProductionCapacityService productionCapacityService;
 
     @PostMapping("/getProductionCapacity")
-    public Result getProductionCapacity(@RequestBody Map<String, String> paramsMap){
-        return productionCapacityService.getProductionCapacity(paramsMap);
+    public Result getProductionCapacity(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return productionCapacityService.getProductionCapacity(request,paramsMap);
     }
 
     @PostMapping("/saveProductionCapacity")
-    public Result saveProductionCapacity(@RequestBody Map<String, String> paramsMap){
-        return productionCapacityService.saveProductionCapacity(paramsMap);
+    public Result saveProductionCapacity(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return productionCapacityService.saveProductionCapacity(request,paramsMap);
     }
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/controller/SubsidyCountController.java

@@ -6,6 +6,7 @@ import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -24,13 +25,13 @@ public class SubsidyCountController {
     private SubsidyCountService subsidyCountService;
 
     @PostMapping("/getSubsidyCount")
-    public Result getSubsidyCount(@RequestBody Map<String, String> paramsMap){
-        return subsidyCountService.getSubsidyCount(paramsMap);
+    public Result getSubsidyCount(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return subsidyCountService.getSubsidyCount(request,paramsMap);
     }
 
     @PostMapping("/saveSubsidyCount")
-    public Result saveSubsidyCount(@RequestBody Map<String, String> paramsMap){
-        return subsidyCountService.saveSubsidyCount(paramsMap);
+    public Result saveSubsidyCount(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return subsidyCountService.saveSubsidyCount(request,paramsMap);
     }
 }
 

huimv-cattle/src/main/java/com/huimv/cattle/mapper/FarmKindCountMapper.java

@@ -2,6 +2,7 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.FarmKindCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -17,7 +18,7 @@ import java.util.List;
 @Repository
 public interface FarmKindCountMapper extends BaseMapper<FarmKindCount> {
 
-    List<FarmKindCount> getFarmKindCount();
+    List<FarmKindCount> getFarmKindCount(@Param("farmCode") String farmCode);
 
-    void deleteAll();
+    void deleteAll(@Param("farmCode") String farmCode);
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/ProductionCapacityMapper.java

@@ -18,7 +18,5 @@ import java.util.List;
 @Repository
 public interface ProductionCapacityMapper extends BaseMapper<ProductionCapacity> {
 
-    List<ProductionCapacity> getProductionCapacity(@Param("yearNum") String yearNum);
-
-    void deleteAll();
+    void deleteAll(@Param("farmCode") String farmCode);
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/SubsidyCountMapper.java

@@ -18,7 +18,5 @@ import java.util.List;
 @Repository
 public interface SubsidyCountMapper extends BaseMapper<SubsidyCount> {
 
-    List<SubsidyCount> getSubsidyCount(@Param("yearNum") String yearNum);
-
-    void deleteAll();
+    void deleteAll(@Param("farmCode") String farmCode);
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/FarmKindCountMapper.xml

@@ -16,11 +16,11 @@
     </sql>
 
     <select id="getFarmKindCount" resultType="com.huimv.cattle.pojo.FarmKindCount">
-        select * from farm_kind_count
+        select * from farm_kind_count where farm_code = #{farmCode}
     </select>
 
     <delete id="deleteAll">
-        delete from farm_kind_count
+        delete from farm_kind_count where farm_code = #{farmCode}
     </delete>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/ProductionCapacityMapper.xml

@@ -15,12 +15,8 @@
         id, year, production_count
     </sql>
 
-    <select id="getProductionCapacity" resultType="com.huimv.cattle.pojo.ProductionCapacity">
-        SELECT * FROM production_capacity ORDER BY YEAR DESC LIMIT ${yearNum}
-    </select>
-
     <delete id="deleteAll">
-        delete from production_capacity
+        delete from production_capacity where farm_code = #{farmCode}
     </delete>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SubsidyCountMapper.xml

@@ -15,12 +15,8 @@
         id, year, subsidy_count
     </sql>
 
-    <select id="getSubsidyCount" resultType="com.huimv.cattle.pojo.SubsidyCount">
-        SELECT * FROM subsidy_count ORDER BY YEAR DESC LIMIT ${yearNum}
-    </select>
-
     <delete id="deleteAll">
-        delete from subsidy_count
+        delete from subsidy_count where farm_code = #{farmCode}
     </delete>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/service/FarmKindCountService.java

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.FarmKindCount;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface FarmKindCountService extends IService<FarmKindCount> {
 
-    Result getFarmKindCount();
+    Result getFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap);
 
-    Result saveFarmKindCount(Map<String, String> paramsMap);
+    Result saveFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/ProductionCapacityService.java

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.ProductionCapacity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface ProductionCapacityService extends IService<ProductionCapacity> {
 
-    Result getProductionCapacity(Map<String, String> paramsMap);
+    Result getProductionCapacity(HttpServletRequest request, Map<String, String> paramsMap);
 
-    Result saveProductionCapacity(Map<String, String> paramsMap);
+    Result saveProductionCapacity(HttpServletRequest request, Map<String, String> paramsMap);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/SubsidyCountService.java

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.SubsidyCount;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface SubsidyCountService extends IService<SubsidyCount> {
 
-    Result getSubsidyCount(Map<String, String> paramsMap);
+    Result getSubsidyCount(HttpServletRequest request, Map<String, String> paramsMap);
 
-    Result saveSubsidyCount(Map<String, String> paramsMap);
+    Result saveSubsidyCount(HttpServletRequest request, Map<String, String> paramsMap);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/FarmKindCountServiceImpl.java

@@ -8,11 +8,14 @@ import com.huimv.cattle.mapper.FarmKindCountMapper;
 import com.huimv.cattle.pojo.IndustryOutput;
 import com.huimv.cattle.service.FarmKindCountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.cattle.token.TokenSign;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -30,14 +33,22 @@ public class FarmKindCountServiceImpl extends ServiceImpl<FarmKindCountMapper, F
     private FarmKindCountMapper farmKindCountMapper;
 
     @Override
-    public Result getFarmKindCount() {
-        List<FarmKindCount> farmKindCount = farmKindCountMapper.getFarmKindCount();
+    public Result getFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        List<FarmKindCount> farmKindCount = farmKindCountMapper.getFarmKindCount(farmCode);
         return new Result(ResultCode.SUCCESS,farmKindCount);
     }
 
     @Override
-    public Result saveFarmKindCount(Map<String, String> paramsMap) {
-        farmKindCountMapper.deleteAll();
+    public Result saveFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        farmKindCountMapper.deleteAll(farmCode);
         String list = paramsMap.get("list");
         JSONArray listJa = JSONArray.parseArray(list);
         for (int a = listJa.size()-1; a >= 0 ; a--){
@@ -45,6 +56,7 @@ public class FarmKindCountServiceImpl extends ServiceImpl<FarmKindCountMapper, F
             FarmKindCount farmKindCount = new FarmKindCount();
             farmKindCount.setFarmKind(jsonObject.getString("farmKind"));
             farmKindCount.setFarmCount(jsonObject.getInteger("farmCount"));
+            farmKindCount.setFarmCode(farmCode);
             farmKindCountMapper.insert(farmKindCount);
         }
         return new Result(ResultCode.SUCCESS);

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/ProductionCapacityServiceImpl.java

@@ -9,6 +9,7 @@ import com.huimv.cattle.mapper.ProductionCapacityMapper;
 import com.huimv.cattle.pojo.SubsidyCount;
 import com.huimv.cattle.service.ProductionCapacityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.cattle.token.TokenSign;
 import com.huimv.cattle.utils.DateUtil;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -37,17 +39,23 @@ public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacit
     private DateUtil dateUtil;
 
     @Override
-    public Result getProductionCapacity(Map<String, String> paramsMap) {
+    public Result getProductionCapacity(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
         String yearNum = paramsMap.get("yearNum");
         if (StringUtils.isBlank(yearNum)){
             yearNum = "0";
         }
         List<ProductionCapacity> productionCapacities = productionCapacityMapper.selectList(new QueryWrapper<ProductionCapacity>()
                 .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
+                .eq("farm_code",farmCode)
                 .orderByDesc("year"));
         if (ObjectUtil.isEmpty(productionCapacities)){
             ProductionCapacity productionCapacity1 = new ProductionCapacity();
             productionCapacity1.setYear(Integer.valueOf(dateUtil.getThisYear()));
+            productionCapacity1.setFarmCode(farmCode);
             productionCapacities.add(productionCapacity1);
             productionCapacityMapper.insert(productionCapacity1);
         }
@@ -56,8 +64,12 @@ public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacit
 
     @Override
     //目前没有判断重复年份
-    public Result saveProductionCapacity(Map<String, String> paramsMap) {
-        productionCapacityMapper.deleteAll();
+    public Result saveProductionCapacity(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        productionCapacityMapper.deleteAll(farmCode);
         String list = paramsMap.get("list");
         JSONArray listJa = JSONArray.parseArray(list);
         for (int a = listJa.size()-1; a >= 0 ; a--){
@@ -69,6 +81,7 @@ public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacit
 //                return new Result(10001,"存在重复年份",false);
 //            }
             productionCapacity.setProductionCount(jsonObject.getInteger("productionCount"));
+            productionCapacity.setFarmCode(farmCode);
             productionCapacityMapper.insert(productionCapacity);
         }
         return new Result(ResultCode.SUCCESS);

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SubsidyCountServiceImpl.java

@@ -9,6 +9,7 @@ import com.huimv.cattle.pojo.SubsidyCount;
 import com.huimv.cattle.mapper.SubsidyCountMapper;
 import com.huimv.cattle.service.SubsidyCountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.cattle.token.TokenSign;
 import com.huimv.cattle.utils.DateUtil;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -37,17 +39,23 @@ public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, Sub
     private DateUtil dateUtil;
 
     @Override
-    public Result getSubsidyCount(Map<String, String> paramsMap) {
+    public Result getSubsidyCount(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
         String yearNum = paramsMap.get("yearNum");
         if (StringUtils.isBlank(yearNum)){
             yearNum = "0";
         }
         List<SubsidyCount> subsidyCounts = subsidyCountMapper.selectList(new QueryWrapper<SubsidyCount>()
                 .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
+                .eq("farm_code",farmCode)
                 .orderByDesc("year"));
         if (ObjectUtil.isEmpty(subsidyCounts)){
             SubsidyCount subsidyCount1 = new SubsidyCount();
             subsidyCount1.setYear(Integer.valueOf(dateUtil.getThisYear()));
+            subsidyCount1.setFarmCode(farmCode);
             subsidyCounts.add(subsidyCount1);
             subsidyCountMapper.insert(subsidyCount1);
         }
@@ -56,8 +64,12 @@ public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, Sub
 
     @Override
     //目前没有判断重复年份
-    public Result saveSubsidyCount(Map<String, String> paramsMap) {
-        subsidyCountMapper.deleteAll();
+    public Result saveSubsidyCount(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = TokenSign.getFarmCode(request);
+        }
+        subsidyCountMapper.deleteAll(farmCode);
         String list = paramsMap.get("list");
         JSONArray listJa = JSONArray.parseArray(list);
         for (int a = listJa.size()-1; a >= 0 ; a--){
@@ -69,6 +81,7 @@ public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, Sub
 //                return new Result(10001,"存在重复年份",false);
 //            }
             subsidyCount.setSubsidyCount(jsonObject.getBigDecimal("subsidyCount"));
+            subsidyCount.setFarmCode(farmCode);
             subsidyCountMapper.insert(subsidyCount);
         }
         return new Result(ResultCode.SUCCESS);