Merge remote-tracking branch 'origin/master'

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

@@ -1,10 +1,17 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.service.OutStockService;
+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("/out-stock")
+@RequestMapping("/v1.0.0/out-stock")
 public class OutStockController {
+    @Autowired
+    private OutStockService outStockService;
+
+    @PostMapping("/getOutStock")
+    public Result getList(@RequestBody Map<String,String> paramsMap) {
+        return outStockService.listOutStock(paramsMap);
+    }
 
+    @PostMapping("/saveOutStock")
+    public Result addOutStock(@RequestBody Map<String,String> paramsMap) {
+        return outStockService.addOutStock(paramsMap);
+    }
 }
 

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

@@ -1,7 +1,14 @@
 package com.huimv.cattle.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.cattle.pojo.OutStock;
 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 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface OutStockMapper extends BaseMapper<OutStock> {
-
+    List<OutStock> listData(@Param(Constants.WRAPPER) QueryWrapper<OutStock> wrapper);
 }

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

@@ -15,5 +15,9 @@
     <sql id="Base_Column_List">
         id, month_name, month, year, out_stock
     </sql>
+    <select id="listData" resultType="com.huimv.cattle.pojo.OutStock">
+        select * from out_stock
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>

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

@@ -2,6 +2,9 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.OutStock;
 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 OutStockService extends IService<OutStock> {
+    Result listOutStock(Map<String,String> paramsMap);
 
+    Result addOutStock(Map<String,String> paramsMap);
 }

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

@@ -1,14 +1,26 @@
 package com.huimv.cattle.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.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 java.time.LocalDate;
+import java.time.Month;
+import java.time.ZonedDateTime;
+import java.util.*;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zn
@@ -17,4 +29,60 @@ import org.springframework.stereotype.Service;
 @Service
 public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> implements OutStockService {
 
+    @Autowired
+    private OutStockMapper outStockMapper;
+
+    @Override
+    public Result listOutStock(Map<String, String> paramsMap) {
+        Integer months = Integer.parseInt(paramsMap.get("months"));
+
+        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("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("month", 12 + zonedDateTime.getMonth().getValue() - i)
+                        .and(Wrapper -> Wrapper.eq("year", zonedDateTime.getYear() - 1));
+                OutStock outStock = outStockMapper.selectOne(queryWrapper);
+                list.add(outStock);
+            }
+
+
+        }
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+    @Override
+    public Result addOutStock(Map<String, String> paramsMap) {
+        String year = paramsMap.get("year");
+        String month = paramsMap.get("month");
+        QueryWrapper<OutStock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("month", month).and(Wrapper -> Wrapper.eq("year", year));
+        OutStock outStock = outStockMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(outStock)) {
+            OutStock outStock1 = new OutStock();
+            outStock1.setMonth(Integer.parseInt(paramsMap.get("month")));
+            outStock1.setYear(Integer.parseInt(paramsMap.get("year")));
+            outStock1.setMonthName(paramsMap.get("monthName"));
+            outStock1.setMonth(Integer.parseInt(paramsMap.get("month")));
+            outStock1.setOutStock(Integer.parseInt(paramsMap.get("outStock")));
+            outStockMapper.insert(outStock1);
+            return new Result(ResultCode.SUCCESS, "添加成功");
+        } else {
+            outStock.setMonth(Integer.parseInt(paramsMap.get("month")));
+            outStock.setYear(Integer.parseInt(paramsMap.get("year")));
+            outStock.setMonthName(paramsMap.get("monthName"));
+            outStock.setMonth(Integer.parseInt(paramsMap.get("month")));
+            outStock.setOutStock(Integer.parseInt(paramsMap.get("outStock")));
+            outStockMapper.updateById(outStock);
+            return new Result(ResultCode.SUCCESS, "修改成功");
+        }
+
+    }
 }

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

@@ -51,8 +51,8 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
 
     @Override
     public Result add(Map<String, String> paramsMap) {
-        String id = paramsMap.get("id");
-        if (ObjectUtil.isEmpty(overviewMapper.selectById(id))) {
+        Overview overList = overviewMapper.getOverList();
+        if (ObjectUtil.isEmpty(overList)) {
             Overview overview = new Overview();
             overview.setStockCount(Integer.parseInt(paramsMap.get("stockCount")));
             overview.setOutCount(Integer.parseInt(paramsMap.get("outCount")));
@@ -64,15 +64,14 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
             overviewMapper.insert(overview);
             return new Result(ResultCode.SUCCESS,"添加成功");
         } else {
-            Overview overview1 = overviewMapper.selectById(id);
-            overview1.setStockCount(Integer.parseInt(paramsMap.get("stockCount")));
-            overview1.setOutCount(Integer.parseInt(paramsMap.get("outCount")));
-            overview1.setBreedCount(Integer.parseInt(paramsMap.get("breedCount")));
-            overview1.setFarmCount(Integer.parseInt(paramsMap.get("farmCount")));
+            overList.setStockCount(Integer.parseInt(paramsMap.get("stockCount")));
+            overList.setOutCount(Integer.parseInt(paramsMap.get("outCount")));
+            overList.setBreedCount(Integer.parseInt(paramsMap.get("breedCount")));
+            overList.setFarmCount(Integer.parseInt(paramsMap.get("farmCount")));
             BigDecimal bg = new BigDecimal(paramsMap.get("outputValue"));
-            overview1.setOutputValue(bg);
-            overview1.setVariety(paramsMap.get("variety"));
-            overviewMapper.updateById(overview1);
+            overList.setOutputValue(bg);
+            overList.setVariety(paramsMap.get("variety"));
+            overviewMapper.updateById(overList);
             return new Result(ResultCode.SUCCESS,"修改成功");
         }
     }

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

@@ -65,8 +65,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         Integer fatStock = Integer.parseInt(paramsMap.get("fatStock"));
         Integer cowStock = Integer.parseInt(paramsMap.get("cowStock"));
         Integer bullStock = Integer.parseInt(paramsMap.get("bullStock"));
-        String id = paramsMap.get("id");
-        if (ObjectUtil.isEmpty(stockMapper.selectById(id))) {
+        Stock list = stockMapper.getList();
+        if (ObjectUtil.isEmpty(list)) {
             Stock stock = new Stock();
             stock.setFatStock(fatStock);
             stock.setCowStock(cowStock);
@@ -74,11 +74,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             stockMapper.insert(stock);
             return new Result(ResultCode.SUCCESS);
         } else {
-            Stock stock = stockMapper.selectById(id);
-            stock.setFatStock(fatStock);
-            stock.setCowStock(cowStock);
-            stock.setBullStock(bullStock);
-            stockMapper.updateById(stock);
+            list.setFatStock(fatStock);
+            list.setCowStock(cowStock);
+            list.setBullStock(bullStock);
+            stockMapper.updateById(list);
             return new Result(ResultCode.SUCCESS);
         }
     }