修改总览、出栏、生产规模

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

@@ -7,6 +7,7 @@ import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -25,13 +26,13 @@ public class OutStockController {
     private OutStockService outStockService;
 
     @PostMapping("/getOutStock")
-    public Result getList(@RequestBody Map<String,String> paramsMap) {
-        return outStockService.listOutStock(paramsMap);
+    public Result getList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return outStockService.listOutStock(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/saveOutStock")
-    public Result addOutStock(@RequestBody Map<String,String> paramsMap) {
-        return outStockService.addOutStock(paramsMap);
+    public Result addOutStock(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return outStockService.addOutStock(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/deleteOutStock")

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

@@ -31,7 +31,7 @@ public class OverviewController {
     }
 
     @PostMapping("/saveOverview")
-    public Result saveOverView(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
+    public Result saveOverView(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return overviewService.add(httpServletRequest,paramsMap);
     }
 

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

@@ -7,6 +7,7 @@ import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -25,13 +26,13 @@ public class SalesCountController {
     private SalesCountService salesCountService;
 
     @PostMapping("/getSalesCount")
-    public Result list() {
-        return salesCountService.getCount();
+    public Result list(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
+        return salesCountService.getCount(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/saveSalesCount")
-    public Result add(@RequestBody Map<String,String> paramsMap) {
-        return salesCountService.addSalesCount(paramsMap);
+    public Result add(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap) {
+        return salesCountService.addSalesCount(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/deleteSalesCount")

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

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.OutStock;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -15,7 +16,7 @@ import java.util.Map;
  * @since 2022-12-15
  */
 public interface OutStockService extends IService<OutStock> {
-    Result listOutStock(Map<String,String> paramsMap);
+    Result listOutStock(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 
-    Result addOutStock(Map<String,String> paramsMap);
+    Result addOutStock(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface OverviewService extends IService<Overview> {
 
-    Result overList(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+    Result overList(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 
-    Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+    Result add(HttpServletRequest httpServletRequest,Map<String, String> paramsMap);
 }

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

@@ -4,6 +4,7 @@ import com.huimv.cattle.pojo.SalesCount;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -15,7 +16,7 @@ import java.util.Map;
  * @since 2022-12-15
  */
 public interface SalesCountService extends IService<SalesCount> {
-    Result getCount();
+    Result getCount(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
-    Result addSalesCount(Map<String,String> paramsMap);
+    Result addSalesCount(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -7,12 +7,14 @@ import com.huimv.cattle.pojo.OutStock;
 import com.huimv.cattle.mapper.OutStockMapper;
 import com.huimv.cattle.service.OutStockService;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
 import java.time.Month;
 import java.time.ZonedDateTime;
@@ -33,20 +35,29 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
     private OutStockMapper outStockMapper;
 
     @Override
-    public Result listOutStock(Map<String, String> paramsMap) {
-        Integer months = Integer.parseInt(paramsMap.get("months"));
-
+    public Result listOutStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        String month = paramsMap.get("months");
+        if (month==null || month=="") {
+            month = "1";
+        }
+        Integer months = Integer.parseInt(month);
         ZonedDateTime zonedDateTime = ZonedDateTime.now();
         List<OutStock> list = new ArrayList<>();
         for (int i = 0; i < months; i++) {
             if ((zonedDateTime.getMonth().getValue() - i) > 0) {
                 QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("farm_code", farmCode);
                 queryWrapper.eq("month", zonedDateTime.getMonth().getValue() - i)
                         .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear()));
                 OutStock outStock = outStockMapper.selectOne(queryWrapper);
                 list.add(outStock);
             } else {
                 QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("farm_code", farmCode);
                 queryWrapper.eq("month", 12 + zonedDateTime.getMonth().getValue() - i)
                         .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear() - 1));
                 OutStock outStock = outStockMapper.selectOne(queryWrapper);
@@ -59,10 +70,15 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
     }
 
     @Override
-    public Result addOutStock(Map<String, String> paramsMap) {
+    public Result addOutStock(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
         String year = paramsMap.get("year");
         String month = paramsMap.get("month");
         QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
         queryWrapper.eq("month", month).and(Wrapper -> Wrapper.eq("year", year));
         OutStock outStock = outStockMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(outStock)) {
@@ -72,6 +88,7 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
             outStock1.setMonthName(paramsMap.get("monthName"));
             outStock1.setMonth(Integer.parseInt(paramsMap.get("month")));
             outStock1.setOutStock(Integer.parseInt(paramsMap.get("outStock")));
+            outStock1.setFarmCode(farmCode);
             outStockMapper.insert(outStock1);
             return new Result(ResultCode.SUCCESS, "添加成功");
         } else {
@@ -80,6 +97,7 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
             outStock.setMonthName(paramsMap.get("monthName"));
             outStock.setMonth(Integer.parseInt(paramsMap.get("month")));
             outStock.setOutStock(Integer.parseInt(paramsMap.get("outStock")));
+            outStock.setFarmCode(farmCode);
             outStockMapper.updateById(outStock);
             return new Result(ResultCode.SUCCESS, "修改成功");
         }

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

@@ -8,6 +8,7 @@ import com.huimv.cattle.mapper.OverviewMapper;
 import com.huimv.cattle.pojo.Stock;
 import com.huimv.cattle.service.OverviewService;
 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.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +32,14 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
     @Autowired
     private OverviewMapper overviewMapper;
     @Override
-    public Result overList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+    public Result overList(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
         String farmCode =paramsMap.get("farmCode");
         if (farmCode==null) {
-            farmCode = httpServletRequest.getHeader("farmCode");
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
         }
-        QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<Overview> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code", farmCode);
-        Overview overview = overviewMapper.getOverList();
+        Overview overview = overviewMapper.selectOne(queryWrapper);
         JSONObject jsonObject = new JSONObject();
         if (ObjectUtil.isEmpty(overview)) {
             jsonObject.put("stockCount", 0);
@@ -60,7 +61,14 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
 
     @Override
     public Result add(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
-        Overview overList = overviewMapper.getOverList();
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        QueryWrapper<Overview> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        Overview overList = overviewMapper.selectOne(queryWrapper);
+       // Overview overList = overviewMapper.getOverList();
         if (ObjectUtil.isEmpty(overList)) {
             Overview overview = new Overview();
             overview.setStockCount(Integer.parseInt(paramsMap.get("stockCount")));
@@ -70,6 +78,7 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
             BigDecimal bg = new BigDecimal(paramsMap.get("outputValue"));
             overview.setOutputValue(bg);
             overview.setVariety(paramsMap.get("variety"));
+            overview.setFarmCode(farmCode);
             overviewMapper.insert(overview);
             return new Result(ResultCode.SUCCESS,"添加成功");
         } else {

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

@@ -8,11 +8,13 @@ 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.cattle.token.TokenSign;
 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 javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -30,9 +32,16 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
     @Autowired
     private SalesCountMapper salesCountMapper;
     @Override
-    public Result getCount() {
-        List<SalesCount> salesCount = salesCountMapper.getCount();
-        if (salesCount.size() == 0) {
+    public Result getCount(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
+        //List<SalesCount> salesCount = salesCountMapper.getCount();
+        QueryWrapper<SalesCount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        List<SalesCount> salesCounts = salesCountMapper.selectList(queryWrapper);
+        if (salesCounts.size() == 0) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("year", 0);
             jsonObject.put("quarter", 0);
@@ -40,18 +49,23 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
             jsonObject.put("salesMoney", 0);
             return new Result(ResultCode.SUCCESS, jsonObject);
         } else {
-            return new Result(ResultCode.SUCCESS, salesCount);
+            return new Result(ResultCode.SUCCESS, salesCounts);
         }
     }
 
     @Override
-    public Result addSalesCount(Map<String, String> paramsMap) {
+    public Result addSalesCount(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
+        String farmCode =paramsMap.get("farmCode");
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
         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("farm_code", farmCode);
         queryWrapper.eq("year", year).and(Wrapper -> Wrapper.eq("quarter", quarter));
         SalesCount salesCount = salesCountMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(salesCount)) {
@@ -60,6 +74,7 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
             salesCount1.setYear(Integer.parseInt(year));
             salesCount1.setQuarter(Integer.parseInt(quarter));
             salesCount1.setSalesMoney(bg);
+            salesCount1.setFarmCode(farmCode);
             salesCountMapper.insert(salesCount1);
             return new Result(ResultCode.SUCCESS, "添加成功");
         } else {

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

@@ -36,7 +36,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     public Result getStock(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
       //  Stock stock = stockMapper.getList();
         String farmCode =paramsMap.get("farmCode");
-         farmCode = FarmCodeUtils.getFarmCode(farmCode, httpServletRequest);
+        if (farmCode==null) {
+            farmCode = TokenSign.getFarmCode(httpServletRequest);
+        }
         QueryWrapper<Stock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code", farmCode);
         Stock stock = stockMapper.selectOne(queryWrapper);