修改存栏状态

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -28,13 +29,13 @@ public class StockStatusController {
     private StockStatusService stockStatusService;
 
     @PostMapping("/getStockStatus")
-    public Result getStockStatus(){
-        return stockStatusService.getStockStatus();
+    public Result getStockStatus(HttpServletRequest request,@RequestBody Map<String, String> paramsMap){
+        return stockStatusService.getStockStatus(request,paramsMap);
     }
 
     @PostMapping("/saveStockStatus")
-    public Result saveStockStatus(@RequestBody StockStatus stockStatus){
-        return stockStatusService.saveStockStatus(stockStatus);
+    public Result saveStockStatus(HttpServletRequest request,@RequestBody Map<String, String> paramsMap){
+        return stockStatusService.saveStockStatus(request,paramsMap);
     }
     
 }

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

@@ -2,6 +2,7 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.StockStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,5 +16,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface StockStatusMapper extends BaseMapper<StockStatus> {
 
-    StockStatus getStockStatus();
+    StockStatus getStockStatus(@Param("farmCode") String farmCode);
 }

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

@@ -17,7 +17,7 @@
     </sql>
 
     <select id="getStockStatus" resultType="com.huimv.cattle.pojo.StockStatus">
-        select * from stock_status
+        select * from stock_status where farm_code = #{farmCode}
     </select>
 
 </mapper>

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

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.StockStatus;
 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 StockStatusService extends IService<StockStatus> {
 
-    Result getStockStatus();
+    Result getStockStatus(HttpServletRequest request,Map<String, String> paramsMap);
 
-    Result saveStockStatus(StockStatus stockStatus);
+    Result saveStockStatus(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -11,6 +11,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +37,9 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
     @Override
     public Result getIndustryOutput(Map<String, String> paramsMap) {
         String yearNum = paramsMap.get("yearNum");
+        if (StringUtils.isBlank(yearNum)){
+            yearNum = "0";
+        }
         List<IndustryOutput> industryOutputs = industryOutputMapper.selectList(new QueryWrapper<IndustryOutput>()
                 .between("year", Integer.valueOf(dateUtil.getThisYear()) - Integer.valueOf(yearNum), Integer.valueOf(dateUtil.getThisYear()))
                 .orderByDesc("year"));

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

@@ -12,6 +12,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +39,9 @@ public class ProductionCapacityServiceImpl extends ServiceImpl<ProductionCapacit
     @Override
     public Result getProductionCapacity(Map<String, String> paramsMap) {
         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()))
                 .orderByDesc("year"));

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

@@ -9,9 +9,11 @@ import com.huimv.cattle.service.StockStatusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.Map;
 
 /**
@@ -29,8 +31,12 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
     private StockStatusMapper stockStatusMapper;
 
     @Override
-    public Result getStockStatus() {
-        StockStatus stockStatus = stockStatusMapper.getStockStatus();
+    public Result getStockStatus(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = request.getHeader("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = paramsMap.get("farmCode");
+        }
+        StockStatus stockStatus = stockStatusMapper.getStockStatus(farmCode);
         if (ObjectUtil.isEmpty(stockStatus)){
             stockStatus = new StockStatus();
             stockStatus.setBreedStock(0);
@@ -42,14 +48,27 @@ public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, Stock
     }
 
     @Override
-    public Result saveStockStatus(StockStatus stockStatus) {
-        if (ObjectUtil.isEmpty(stockStatusMapper.selectById(stockStatus))){
-            StockStatus stockStatus1 = new StockStatus();
-            stockStatus1.setBreedStock(stockStatus.getBreedStock());
-            stockStatus1.setRaiseStock(stockStatus.getRaiseStock());
-            stockStatus1.setCalfStock(stockStatus.getCalfStock());
+    public Result saveStockStatus(HttpServletRequest request, Map<String, String> paramsMap) {
+        String farmCode = request.getHeader("farmCode");
+        if (StringUtils.isBlank(farmCode)){
+            farmCode = paramsMap.get("farmCode");
+        }
+        String breedStock = paramsMap.get("breedStock");
+        String raiseStock = paramsMap.get("raiseStock");
+        String calfStock = paramsMap.get("calfStock");
+
+        StockStatus stockStatus1 = new StockStatus();
+        stockStatus1.setBreedStock(Integer.parseInt(breedStock));
+        stockStatus1.setRaiseStock(Integer.parseInt(raiseStock));
+        stockStatus1.setCalfStock(Integer.parseInt(calfStock));
+        stockStatus1.setFarmCode(farmCode);
+        StockStatus stockStatus = stockStatusMapper.selectOne(new QueryWrapper<StockStatus>().eq("farm_code", farmCode));
+        if (ObjectUtil.isEmpty(stockStatus)){
             stockStatusMapper.insert(stockStatus1);
         }else {
+            stockStatus.setBreedStock(Integer.parseInt(breedStock));
+            stockStatus.setCalfStock(Integer.parseInt(calfStock));
+            stockStatus.setRaiseStock(Integer.parseInt(raiseStock));
             stockStatusMapper.updateById(stockStatus);
         }
         return new Result(ResultCode.SUCCESS);

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

@@ -12,6 +12,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +39,9 @@ public class SubsidyCountServiceImpl extends ServiceImpl<SubsidyCountMapper, Sub
     @Override
     public Result getSubsidyCount(Map<String, String> paramsMap) {
         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()))
                 .orderByDesc("year"));