添加farmCode验证

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

@@ -41,7 +41,8 @@ public class FarmStockRankController {
         String farmCode = FarmCodeUtils.getFarmCode(farmStockRankVo.getFarmCode(), request);
         List<FarmStockRank> farmStockRanks = farmStockRankVo.getFarmStockRanks();
         farmStockRankService.remove(new QueryWrapper<FarmStockRank>().eq("farm_code",farmCode));
-        System.out.println(farmCode);
+        System.out.println(farmStockRankVo.getFarmCode());
+        System.out.println(farmStockRanks.toString());
         for (FarmStockRank farmStockRank : farmStockRanks) {
             farmStockRank.setFarmCode(farmCode);
             farmStockRankService.save(farmStockRank);

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

@@ -5,12 +5,16 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.Insure;
+import com.huimv.cattle.pojo.VaccineDelivery;
+import com.huimv.cattle.pojo.vo.InsureVo;
 import com.huimv.cattle.service.InsureService;
+import com.huimv.cattle.utils.FarmCodeUtils;
 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.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -32,8 +36,15 @@ public class InsureController {
     private InsureService insureService;
 
     @PostMapping("/saveInsure")
-    public Result add(@RequestBody Insure insure){
-        insureService.save(insure);
+    public Result add(@RequestBody InsureVo insureVo , HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(insureVo.getFarmCode(), request);
+        List<Insure> insureList = insureVo.getInsureList();
+        insureService.remove(new QueryWrapper<Insure>().eq("farm_code",farmCode));
+        System.out.println(farmCode);
+        for (Insure insure : insureList) {
+            insure.setFarmCode(farmCode);
+            insureService.save(insure);
+        }
         return new Result(10000,"添加成功",true);
     }
     @PostMapping("/updateInsure")
@@ -51,8 +62,9 @@ public class InsureController {
         return new Result(10000,"删除成功",true);
     }
     @PostMapping("/getInsure")
-    public  Result getInsure(@RequestBody Insure insure){
-        List<Insure> list = insureService.list(new QueryWrapper<Insure>().orderByDesc("insurance_time"));
+    public  Result getInsure(@RequestBody Insure insure, HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(insure.getFarmCode(), request);
+        List<Insure> list = insureService.list(new QueryWrapper<Insure>().eq("farm_code",farmCode).orderByDesc("insurance_time"));
         if (ObjectUtil.isEmpty(list)){
             return new Result(ResultCode.SUCCESS,new ArrayList<>());
         }

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

@@ -4,13 +4,19 @@ package com.huimv.cattle.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.pojo.FarmStockRank;
 import com.huimv.cattle.pojo.VaccineDelivery;
+import com.huimv.cattle.pojo.vo.VaccineDeliveryVo;
 import com.huimv.cattle.service.VaccineDeliveryService;
+import com.huimv.cattle.utils.FarmCodeUtils;
 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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -32,14 +38,14 @@ public class VaccineDeliveryController {
     private VaccineDeliveryService vaccineDeliveryService;
 
     @PostMapping("/saveVaccineDelivery")
-    public Result add(@RequestBody VaccineDelivery vaccineDelivery){
-        Integer year = vaccineDelivery.getYear();
-        VaccineDelivery year1 = vaccineDeliveryService.getOne(new QueryWrapper<VaccineDelivery>().eq("year", year));
-        if (ObjectUtil.isNotEmpty(year1)){
-            year1.setDeliveryCount(vaccineDelivery.getDeliveryCount());
-            year1.setYear(vaccineDelivery.getYear());
-            vaccineDeliveryService.updateById(year1);
-        }else {
+    @Transactional
+    public Result add(@RequestBody VaccineDeliveryVo vaccineDeliveryVo, HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(vaccineDeliveryVo.getFarmCode(), request);
+        List<VaccineDelivery> vaccineDeliveries = vaccineDeliveryVo.getVaccineDeliveryList();
+        vaccineDeliveryService.remove(new QueryWrapper<VaccineDelivery>().eq("farm_code",farmCode));
+        System.out.println(farmCode);
+        for (VaccineDelivery vaccineDelivery : vaccineDeliveries) {
+            vaccineDelivery.setFarmCode(farmCode);
             vaccineDeliveryService.save(vaccineDelivery);
         }
         return new Result(10000,"添加成功",true);
@@ -68,10 +74,14 @@ public class VaccineDeliveryController {
     }
 
     @PostMapping("/getVaccineDelivery")
-    public  Result getVaccineDelivery(@RequestBody Map<String,Integer> paramMap){
-        Integer yearNum = paramMap.get("yearNum");
+    public  Result getVaccineDelivery(@RequestBody Map<String,String> paramMap, HttpServletRequest request){
+        String yearNum = paramMap.get("yearNum");
+        String farmCode = FarmCodeUtils.getFarmCode(paramMap.get("farmCode"), request);
+        if (StringUtils.isBlank(yearNum)){
+            yearNum ="0";
+        }
         int year = DateUtil.year(new Date());
-        List<VaccineDelivery> list = vaccineDeliveryService.list(new QueryWrapper<VaccineDelivery>().ge("year", (year - yearNum)));
+        List<VaccineDelivery> list = vaccineDeliveryService.list(new QueryWrapper<VaccineDelivery>().eq("farm_code",farmCode).ge("year", (year - Integer.parseInt(yearNum))));
         return new Result(ResultCode.SUCCESS,list);
     }
 }

huimv-cattle/src/main/java/com/huimv/cattle/pojo/FarmStockRank.java

@@ -21,7 +21,7 @@ public class FarmStockRank implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private String farm;

huimv-cattle/src/main/java/com/huimv/cattle/pojo/vo/FarmStockRankVo.java

@@ -1,18 +1,10 @@
 package com.huimv.cattle.pojo.vo;
 
 import com.huimv.cattle.pojo.FarmStockRank;
-import com.huimv.cattle.pojo.PreventDetection;
 import lombok.Data;
 
 import java.util.List;
 
-/**
- * @Project : huimv.shiwan
- * @Package : com.huimv.cattle.pojo.vo
- * @Description : TODO
- * @Author : yuxuexuan
- * @Create : 2022/12/19 0019 10:07
- **/
 @Data
 public class FarmStockRankVo {
     private List<FarmStockRank> farmStockRanks;

huimv-cattle/src/main/java/com/huimv/cattle/pojo/vo/InsureVo.java

@@ -0,0 +1,12 @@
+package com.huimv.cattle.pojo.vo;
+
+import com.huimv.cattle.pojo.Insure;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InsureVo {
+    private List<Insure> insureList;
+    private String farmCode ;
+}

huimv-cattle/src/main/java/com/huimv/cattle/pojo/vo/SalesCattleVo.java

@@ -6,13 +6,6 @@ import lombok.Data;
 
 import java.util.List;
 
-/**
- * @Project : huimv.shiwan
- * @Package : com.huimv.cattle.pojo.vo
- * @Description : TODO
- * @Author : yuxuexuan
- * @Create : 2022/12/19 0019 9:26
- **/
 @Data
 public class SalesCattleVo {
 

huimv-cattle/src/main/java/com/huimv/cattle/pojo/vo/VaccineDeliveryVo.java

@@ -0,0 +1,13 @@
+package com.huimv.cattle.pojo.vo;
+
+import com.huimv.cattle.pojo.VaccineDelivery;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class VaccineDeliveryVo {
+    private List<VaccineDelivery> vaccineDeliveryList;
+    private String farmCode ;
+}

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

@@ -53,7 +53,7 @@ public class SuperviseServiceImpl extends ServiceImpl<SuperviseMapper, Supervise
         if (ObjectUtil.isEmpty(supervise)){
             return "0";
         }else {
-            return supervise.getSuperviseCode();
+            return supervise.getSuperviseData();
         }
     }