修复重复日期

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

@@ -4,11 +4,9 @@ package com.huimv.cattle.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.FarmStockRank;
-import com.huimv.cattle.pojo.SalesCattle;
 import com.huimv.cattle.pojo.SysFarm;
 import com.huimv.cattle.pojo.vo.FarmStockRankVo;
 import com.huimv.cattle.service.DataSourceService;
@@ -33,6 +31,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -61,6 +61,19 @@ public class FarmStockRankController {
     public Result add(@RequestBody FarmStockRankVo farmStockRankVo, HttpServletRequest request){
         String farmCode = FarmCodeUtils.getFarmCode(farmStockRankVo.getFarmCode(), request);
         List<FarmStockRank> farmStockRanks = farmStockRankVo.getFarmStockRanks();
+        if (!ObjectUtil.isNull(farmStockRanks)) {
+            for (FarmStockRank farmStockRank : farmStockRanks) {
+                Integer count = 0;
+                for (FarmStockRank stockRank : farmStockRanks) {
+                    if (farmStockRank.getFarm().equals(stockRank.getFarm())){
+                        count++;
+                    }
+                }
+                if (count > 1){
+                    return new Result(10001,"存在重复牧场",false);
+                }
+            }
+        }
         farmStockRankService.remove(new QueryWrapper<FarmStockRank>().eq("farm_code",farmCode));
         for (FarmStockRank farmStockRank : farmStockRanks) {
             farmStockRank.setFarmCode(farmCode);

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

@@ -46,6 +46,24 @@ public class PreventDetectionController {
     public  Result add(@RequestBody PreventDetectionVo preventDetection, HttpServletRequest request){
         String farmCode = FarmCodeUtils.getFarmCode(preventDetection.getFarmCode(), request);
         List<PreventDetection> preventDetection1 = preventDetection.getPreventDetection();
+        for (PreventDetection detection1 : preventDetection1) {
+            if (Integer.valueOf(detection1.getAcceptanceNum()) > Integer.valueOf(detection1.getDetectionNum())){
+                return new Result(10001,"合格数应小于或等于检测数",false);
+            }
+        }
+        if (!ObjectUtil.isNull(preventDetection1)) {
+            for (PreventDetection detection : preventDetection1) {
+                Integer count = 0;
+                for (PreventDetection preventDetection2 : preventDetection1) {
+                    if (preventDetection2.getYear().equals(detection.getYear()) && preventDetection2.getMonth().equals(detection.getMonth())){
+                        count++;
+                    }
+                    if (count > 1){
+                        return new Result(10002,"存在重复日期",false);
+                    }
+                }
+            }
+        }
         preventDetectionService.remove(new QueryWrapper<PreventDetection>().eq("farm_code",farmCode));
         System.out.println(farmCode);
         for (PreventDetection detection : preventDetection1) {

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

@@ -60,6 +60,19 @@ public class SalesCattleController {
     public Result add(@RequestBody SalesCattleVo salesCattleVo, HttpServletRequest request){
         String farmCode = FarmCodeUtils.getFarmCode(salesCattleVo.getFarmCode(), request);
         List<SalesCattle> salesCattles = salesCattleVo.getSalesCattles();
+        if (!ObjectUtil.isNull(salesCattles)) {
+            for (SalesCattle salesCattle : salesCattles) {
+                Integer count = 0;
+                for (SalesCattle cattle : salesCattles) {
+                    if (cattle.getYear().equals(salesCattle.getYear()) && cattle.getQuarter().equals(salesCattle.getQuarter())){
+                        count++;
+                    }
+                    if (count > 1){
+                        return new Result(10001,"存在重复日期",false);
+                    }
+                }
+            }
+        }
         salesCattleService.remove(new QueryWrapper<SalesCattle>().eq("farm_code",farmCode));
         System.out.println(farmCode);
         for (SalesCattle salesCattle : salesCattles) {

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

@@ -52,6 +52,19 @@ public class VaccineDeliveryController {
     public Result add(@RequestBody VaccineDeliveryVo vaccineDeliveryVo, HttpServletRequest request){
         String farmCode = FarmCodeUtils.getFarmCode(vaccineDeliveryVo.getFarmCode(), request);
         List<VaccineDelivery> vaccineDeliveries = vaccineDeliveryVo.getVaccineDeliveryList();
+        if (!ObjectUtil.isNull(vaccineDeliveries)){
+            for (VaccineDelivery vaccineDelivery : vaccineDeliveries) {
+                Integer count = 0;
+                for (VaccineDelivery delivery : vaccineDeliveries) {
+                    if (delivery.getYear().equals(vaccineDelivery.getYear())){
+                        count++;
+                    }
+                    if (count > 1){
+                        return new Result(10001,"存在重复年份",false);
+                    }
+                }
+            }
+        }
         vaccineDeliveryService.remove(new QueryWrapper<VaccineDelivery>().eq("farm_code",farmCode));
         System.out.println(farmCode);
         for (VaccineDelivery vaccineDelivery : vaccineDeliveries) {

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

@@ -86,6 +86,19 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStock> i
         String list = paramsMap.get("list");
         JSONArray jsonArray = JSONArray.parseArray(list);
         List<OutStock> outStocks = jsonArray.toJavaList(OutStock.class);
+        if (!ObjectUtil.isNull(outStocks)) {
+            for (OutStock outStock : outStocks) {
+                Integer count = 0;
+                for (OutStock stock : outStocks) {
+                    if (stock.getYear().equals(outStock.getYear()) && stock.getMonth().equals(outStock.getMonth())){
+                        count++;
+                    }
+                    if (count > 1){
+                        return new Result(10001,"存在重复日期",false);
+                    }
+                }
+            }
+        }
         QueryWrapper<OutStock> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_code", farmCode);
         outStockMapper.delete(queryWrapper1);

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

@@ -61,6 +61,19 @@ public class SalesCountServiceImpl extends ServiceImpl<SalesCountMapper, SalesCo
         String list = paramsMap.get("list");
         JSONArray jsonArray = JSONArray.parseArray(list);
         List<SalesCount> lists = jsonArray.toJavaList(SalesCount.class);
+        if (!ObjectUtil.isNull(lists)) {
+            for (SalesCount salesCount : lists) {
+                Integer count = 0;
+                for (SalesCount list1 : lists) {
+                    if (list1.getYear().equals(salesCount.getYear()) && list1.getQuarter().equals(salesCount.getQuarter())){
+                        count++;
+                    }
+                    if (count > 1){
+                        return new Result(10001,"存在重复日期",false);
+                    }
+                }
+            }
+        }
         QueryWrapper<SalesCount> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_code", farmCode);
         salesCountMapper.delete(queryWrapper1);