瀏覽代碼

Merge remote-tracking branch 'origin/master'

zhuoning 2 年之前
父節點
當前提交
95157bb7f2
共有 22 個文件被更改,包括 319 次插入9 次删除
  1. 1 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/FarmKindCountController.java
  2. 1 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/IndustryOutputController.java
  3. 1 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/OnlineServiceController.java
  4. 11 0
      huimv-cattle/src/main/java/com/huimv/cattle/controller/OutStockController.java
  5. 11 0
      huimv-cattle/src/main/java/com/huimv/cattle/controller/OverviewController.java
  6. 20 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/ProductionCapacityController.java
  7. 31 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/SalesCountController.java
  8. 11 0
      huimv-cattle/src/main/java/com/huimv/cattle/controller/StockController.java
  9. 1 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/StockStatusController.java
  10. 19 1
      huimv-cattle/src/main/java/com/huimv/cattle/controller/SubsidyCountController.java
  11. 8 0
      huimv-cattle/src/main/java/com/huimv/cattle/mapper/ProductionCapacityMapper.java
  12. 6 1
      huimv-cattle/src/main/java/com/huimv/cattle/mapper/SalesCountMapper.java
  13. 8 0
      huimv-cattle/src/main/java/com/huimv/cattle/mapper/SubsidyCountMapper.java
  14. 8 0
      huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/ProductionCapacityMapper.xml
  15. 3 1
      huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SalesCountMapper.xml
  16. 8 0
      huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SubsidyCountMapper.xml
  17. 6 0
      huimv-cattle/src/main/java/com/huimv/cattle/service/ProductionCapacityService.java
  18. 5 0
      huimv-cattle/src/main/java/com/huimv/cattle/service/SalesCountService.java
  19. 6 0
      huimv-cattle/src/main/java/com/huimv/cattle/service/SubsidyCountService.java
  20. 50 0
      huimv-cattle/src/main/java/com/huimv/cattle/service/impl/ProductionCapacityServiceImpl.java
  21. 54 0
      huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SalesCountServiceImpl.java
  22. 50 0
      huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SubsidyCountServiceImpl.java

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

@@ -21,7 +21,7 @@ import java.util.Map;
  * @since 2022-12-15
  */
 @RestController
-@RequestMapping("/v1.0.0/farm-kind-count")
+@RequestMapping("/v1.0.0/farmKindCount")
 public class FarmKindCountController {
     @Autowired
     private FarmKindCountService farmKindCountService;

+ 1 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/IndustryOutputController.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * @since 2022-12-15
  */
 @RestController
-@RequestMapping("/v1.0.0/industry-output")
+@RequestMapping("/v1.0.0/industryOutput")
 public class IndustryOutputController {
     @Autowired
     private IndustryOutputService industryOutputService;

+ 1 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/OnlineServiceController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-12-15
  */
 @RestController
-@RequestMapping("/v1.0.0/online-service")
+@RequestMapping("/v1.0.0/onlineService")
 public class OnlineServiceController {
     @Autowired
     private OnlineServiceService onlineServiceService;

+ 11 - 0
huimv-cattle/src/main/java/com/huimv/cattle/controller/OutStockController.java

@@ -3,6 +3,7 @@ package com.huimv.cattle.controller;
 
 import com.huimv.cattle.service.OutStockService;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,5 +36,15 @@ public class OutStockController {
     public Result addOutStock(@RequestBody Map<String,String> paramsMap) {
         return outStockService.addOutStock(paramsMap);
     }
+
+    @PostMapping("/deleteOutStock")
+    public Result delete(@RequestBody Map<String,String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] id=ids.split(",");
+        for (String s : id) {
+            outStockService.removeById(s);
+        }
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
 }
 

+ 11 - 0
huimv-cattle/src/main/java/com/huimv/cattle/controller/OverviewController.java

@@ -3,6 +3,7 @@ package com.huimv.cattle.controller;
 
 import com.huimv.cattle.service.OverviewService;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,5 +36,15 @@ public class OverviewController {
     public Result saveOverView(@RequestBody Map<String,String> paramsMap) {
         return overviewService.add(paramsMap);
     }
+
+    @PostMapping("/deleteSaveOverview")
+    public Result delete(@RequestBody Map<String,String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] id=ids.split(",");
+        for (String s : id) {
+            overviewService.removeById(s);
+        }
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
 }
 

+ 20 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/ProductionCapacityController.java

@@ -1,10 +1,17 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.service.ProductionCapacityService;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +21,20 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-12-15
  */
 @RestController
-@RequestMapping("/production-capacity")
+@RequestMapping("/v1.0.0/productionCapacity")
 public class ProductionCapacityController {
+    @Autowired
+    private ProductionCapacityService productionCapacityService;
+
+    @PostMapping("/getProductionCapacity")
+    public Result getProductionCapacity(@RequestBody Map<String, String> paramsMap){
+        return productionCapacityService.getProductionCapacity(paramsMap);
+    }
+
+    @PostMapping("/saveProductionCapacity")
+    public Result saveProductionCapacity(@RequestBody Map<String, String> paramsMap){
+        return productionCapacityService.saveProductionCapacity(paramsMap);
+    }
 
 }
 

+ 31 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/SalesCountController.java

@@ -1,10 +1,18 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.service.SalesCountService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +22,30 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-12-15
  */
 @RestController
-@RequestMapping("/sales-count")
+@RequestMapping("/v1.0.0/salesCount")
 public class SalesCountController {
+    @Autowired
+    private SalesCountService salesCountService;
+
+    @PostMapping("/getSalesCount")
+    public Result list() {
+        return salesCountService.getCount();
+    }
+
+    @PostMapping("/saveSalesCount")
+    public Result add(@RequestBody Map<String,String> paramsMap) {
+        return salesCountService.addSalesCount(paramsMap);
+    }
+
+    @PostMapping("/deleteSalesCount")
+    public Result delete(@RequestBody Map<String,String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] id=ids.split(",");
+        for (String s : id) {
+            salesCountService.removeById(s);
+        }
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
 
 }
 

+ 11 - 0
huimv-cattle/src/main/java/com/huimv/cattle/controller/StockController.java

@@ -3,6 +3,7 @@ package com.huimv.cattle.controller;
 
 import com.huimv.cattle.service.StockService;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,5 +36,15 @@ public class StockController {
     public Result saveStock(@RequestBody Map<String,String> paramsMap) {
         return stockService.add(paramsMap);
     }
+
+    @PostMapping("/deleteSaveStock")
+    public Result delete(@RequestBody Map<String,String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        String[] id=ids.split(",");
+        for (String s : id) {
+            stockService.removeById(s);
+        }
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
 }
 

+ 1 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/StockStatusController.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * @since 2022-12-14
  */
 @RestController
-@RequestMapping("/v1.0.0/stock-status")
+@RequestMapping("/v1.0.0/stockStatus")
 public class StockStatusController {
     @Autowired
     private StockStatusService stockStatusService;

+ 19 - 1
huimv-cattle/src/main/java/com/huimv/cattle/controller/SubsidyCountController.java

@@ -1,10 +1,17 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.service.SubsidyCountService;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +21,19 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-12-15
  */
 @RestController
-@RequestMapping("/subsidy-count")
+@RequestMapping("/v1.0.0/subsidyCount")
 public class SubsidyCountController {
+    @Autowired
+    private SubsidyCountService subsidyCountService;
+
+    @PostMapping("/getSubsidyCount")
+    public Result getSubsidyCount(@RequestBody Map<String, String> paramsMap){
+        return subsidyCountService.getSubsidyCount(paramsMap);
+    }
 
+    @PostMapping("/saveSubsidyCount")
+    public Result saveSubsidyCount(@RequestBody Map<String, String> paramsMap){
+        return subsidyCountService.saveSubsidyCount(paramsMap);
+    }
 }
 

+ 8 - 0
huimv-cattle/src/main/java/com/huimv/cattle/mapper/ProductionCapacityMapper.java

@@ -2,6 +2,10 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.ProductionCapacity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +15,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface ProductionCapacityMapper extends BaseMapper<ProductionCapacity> {
 
+    List<ProductionCapacity> getProductionCapacity(@Param("yearNum") String yearNum);
+
+    void deleteAll();
 }

+ 6 - 1
huimv-cattle/src/main/java/com/huimv/cattle/mapper/SalesCountMapper.java

@@ -2,6 +2,10 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.SalesCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
 
 /**
  * <p>
@@ -11,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface SalesCountMapper extends BaseMapper<SalesCount> {
-
+    List<SalesCount> getCount();
 }

+ 8 - 0
huimv-cattle/src/main/java/com/huimv/cattle/mapper/SubsidyCountMapper.java

@@ -2,6 +2,10 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.SubsidyCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +15,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface SubsidyCountMapper extends BaseMapper<SubsidyCount> {
 
+    List<SubsidyCount> getSubsidyCount(@Param("yearNum") String yearNum);
+
+    void deleteAll();
 }

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

@@ -14,4 +14,12 @@
         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>
+
 </mapper>

+ 3 - 1
huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/SalesCountMapper.xml

@@ -15,5 +15,7 @@
     <sql id="Base_Column_List">
         id, year, quarter, quarter_name, sales_money
     </sql>
-
+    <select id="getCount" resultType="com.huimv.cattle.pojo.SalesCount">
+        select * from sales_count
+    </select>
 </mapper>

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

@@ -14,4 +14,12 @@
         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>
+
 </mapper>

+ 6 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/ProductionCapacityService.java

@@ -2,6 +2,9 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.ProductionCapacity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ProductionCapacityService extends IService<ProductionCapacity> {
 
+    Result getProductionCapacity(Map<String, String> paramsMap);
+
+    Result saveProductionCapacity(Map<String, String> paramsMap);
 }

+ 5 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/SalesCountService.java

@@ -2,6 +2,9 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.SalesCount;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-12-15
  */
 public interface SalesCountService extends IService<SalesCount> {
+    Result getCount();
 
+    Result addSalesCount(Map<String,String> paramsMap);
 }

+ 6 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/SubsidyCountService.java

@@ -2,6 +2,9 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.SubsidyCount;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface SubsidyCountService extends IService<SubsidyCount> {
 
+    Result getSubsidyCount(Map<String, String> paramsMap);
+
+    Result saveSubsidyCount(Map<String, String> paramsMap);
 }

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

@@ -1,10 +1,23 @@
 package com.huimv.cattle.service.impl;
 
+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.cattle.pojo.ProductionCapacity;
 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.utils.DateUtil;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,5 +29,42 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacityMapper, ProductionCapacity> implements ProductionCapacityService {
+    @Autowired
+    private ProductionCapacityMapper productionCapacityMapper;
+
+    @Autowired
+    private DateUtil dateUtil;
+
+    @Override
+    public Result getProductionCapacity(Map<String, String> paramsMap) {
+        String yearNum = paramsMap.get("yearNum");
+        List<ProductionCapacity> productionCapacity = productionCapacityMapper.getProductionCapacity(yearNum);
+        if (ObjectUtil.isEmpty(productionCapacity)){
+            ProductionCapacity productionCapacity1 = new ProductionCapacity();
+            productionCapacity1.setYear(Integer.valueOf(dateUtil.getThisYear()));
+            productionCapacity.add(productionCapacity1);
+            productionCapacityMapper.insert(productionCapacity1);
+        }
+        return new Result(ResultCode.SUCCESS,productionCapacity);
+    }
 
+    @Override
+    //目前没有判断重复年份
+    public Result saveProductionCapacity(Map<String, String> paramsMap) {
+        productionCapacityMapper.deleteAll();
+        String list = paramsMap.get("list");
+        JSONArray listJa = JSONArray.parseArray(list);
+        for (int a = listJa.size()-1; a >= 0 ; a--){
+            JSONObject jsonObject = listJa.getJSONObject(a);
+            Integer year = jsonObject.getInteger("year");
+            ProductionCapacity productionCapacity = new ProductionCapacity();
+            productionCapacity.setYear(year);
+//            if (ObjectUtil.isNotEmpty(productionCapacityMapper.selectOne(new QueryWrapper<ProductionCapacity>().eq("year",year)))){
+//                return new Result(10001,"存在重复年份",false);
+//            }
+            productionCapacity.setProductionCount(jsonObject.getInteger("productionCount"));
+            productionCapacityMapper.insert(productionCapacity);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
 }

+ 54 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SalesCountServiceImpl.java

@@ -1,11 +1,22 @@
 package com.huimv.cattle.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.SalesCount;
 import com.huimv.cattle.mapper.SalesCountMapper;
 import com.huimv.cattle.service.SalesCountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +27,48 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCount> implements SalesCountService {
+    @Autowired
+    private SalesCountMapper salesCountMapper;
+    @Override
+    public Result getCount() {
+        List<SalesCount> salesCount = salesCountMapper.getCount();
+        if (salesCount.size() == 0) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("year", 0);
+            jsonObject.put("quarter", 0);
+            jsonObject.put("quarterName", 0);
+            jsonObject.put("salesMoney", 0);
+            return new Result(ResultCode.SUCCESS, jsonObject);
+        } else {
+            return new Result(ResultCode.SUCCESS, salesCount);
+        }
+    }
 
+    @Override
+    public Result addSalesCount(Map<String, String> paramsMap) {
+        String year = paramsMap.get("year");
+        String quarter = paramsMap.get("quarter");
+        String quarterName = paramsMap.get("quarterName");
+        String salesMoney = paramsMap.get("salesMoney");
+        BigDecimal bg = new BigDecimal(salesMoney);
+        QueryWrapper<SalesCount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("year", year).and(Wrapper -> Wrapper.eq("quarter", quarter));
+        SalesCount salesCount = salesCountMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(salesCount)) {
+            SalesCount salesCount1 = new SalesCount();
+            salesCount1.setQuarterName(quarterName);
+            salesCount1.setYear(Integer.parseInt(year));
+            salesCount1.setQuarter(Integer.parseInt(quarter));
+            salesCount1.setSalesMoney(bg);
+            salesCountMapper.insert(salesCount1);
+            return new Result(ResultCode.SUCCESS, "添加成功");
+        } else {
+            salesCount.setSalesMoney(bg);
+            salesCount.setQuarter(Integer.parseInt(quarter));
+            salesCount.setYear(Integer.parseInt(year));
+            salesCount.setQuarterName(quarterName);
+            salesCountMapper.updateById(salesCount);
+            return new Result(ResultCode.SUCCESS, "编辑成功");
+        }
+    }
 }

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

@@ -1,10 +1,23 @@
 package com.huimv.cattle.service.impl;
 
+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.cattle.pojo.IndustryOutput;
 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.utils.DateUtil;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,5 +29,42 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, SubsidyCount> implements SubsidyCountService {
+    @Autowired
+    private SubsidyCountMapper subsidyCountMapper;
+
+    @Autowired
+    private DateUtil dateUtil;
+
+    @Override
+    public Result getSubsidyCount(Map<String, String> paramsMap) {
+        String yearNum = paramsMap.get("yearNum");
+        List<SubsidyCount> subsidyCount = subsidyCountMapper.getSubsidyCount(yearNum);
+        if (ObjectUtil.isEmpty(subsidyCount)){
+            SubsidyCount subsidyCount1 = new SubsidyCount();
+            subsidyCount1.setYear(Integer.valueOf(dateUtil.getThisYear()));
+            subsidyCount.add(subsidyCount1);
+            subsidyCountMapper.insert(subsidyCount1);
+        }
+        return new Result(ResultCode.SUCCESS,subsidyCount);
+    }
 
+    @Override
+    //目前没有判断重复年份
+    public Result saveSubsidyCount(Map<String, String> paramsMap) {
+        subsidyCountMapper.deleteAll();
+        String list = paramsMap.get("list");
+        JSONArray listJa = JSONArray.parseArray(list);
+        for (int a = listJa.size()-1; a >= 0 ; a--){
+            JSONObject jsonObject = listJa.getJSONObject(a);
+            Integer year = jsonObject.getInteger("year");
+            SubsidyCount subsidyCount = new SubsidyCount();
+            subsidyCount.setYear(year);
+//            if (ObjectUtil.isNotEmpty(subsidyCountMapper.selectOne(new QueryWrapper<SubsidyCount>().eq("year",year)))){
+//                return new Result(10001,"存在重复年份",false);
+//            }
+            subsidyCount.setSubsidyCount(jsonObject.getBigDecimal("subsidyCount"));
+            subsidyCountMapper.insert(subsidyCount);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
 }