添加farmCode验证

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

@@ -4,12 +4,17 @@ package com.huimv.cattle.controller;
 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.SalesCattle;
+import com.huimv.cattle.pojo.vo.FarmStockRankVo;
 import com.huimv.cattle.service.FarmStockRankService;
+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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -31,14 +36,14 @@ public class FarmStockRankController {
     private FarmStockRankService farmStockRankService;
 
     @PostMapping("/saveFarmStockRank")
-    public Result add(@RequestBody FarmStockRank farmStockRank){
-        String farm = farmStockRank.getFarm();
-        FarmStockRank farm1 = farmStockRankService.getOne(new QueryWrapper<FarmStockRank>().eq("farm", farm));
-        if (ObjectUtil.isNotEmpty(farm1)){
-            farm1.setFarm(farmStockRank.getFarm());
-            farm1.setStock(farmStockRank.getStock());
-            farmStockRankService.updateById(farm1);
-        }else {
+    @Transactional
+    public Result add(@RequestBody FarmStockRankVo farmStockRankVo, HttpServletRequest request){
+        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);
+        for (FarmStockRank farmStockRank : farmStockRanks) {
+            farmStockRank.setFarmCode(farmCode);
             farmStockRankService.save(farmStockRank);
         }
         return new Result(10000,"添加成功",true);
@@ -58,8 +63,9 @@ public class FarmStockRankController {
         return new Result(10000,"删除成功",true);
     }
     @PostMapping("/getFarmStockRank")
-    public  Result list(@RequestBody FarmStockRank farmStockRank){
-        List<FarmStockRank> list = farmStockRankService.list(new QueryWrapper<FarmStockRank>().orderByDesc("stock"));
+    public  Result list(@RequestBody FarmStockRank farmStockRank,HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(farmStockRank.getFarmCode(), request);
+        List<FarmStockRank> list = farmStockRankService.list(new QueryWrapper<FarmStockRank>().eq("farm_code",farmCode).orderByDesc("stock"));
         if (ObjectUtil.isEmpty(list)){
             return new Result(ResultCode.SUCCESS,new ArrayList<>());
         }

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

@@ -3,13 +3,18 @@ package com.huimv.cattle.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.pojo.PreventDetection;
 import com.huimv.cattle.pojo.SalesCattle;
+import com.huimv.cattle.pojo.vo.SalesCattleVo;
 import com.huimv.cattle.service.SalesCattleService;
+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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -29,17 +34,15 @@ public class SalesCattleController {
     @Autowired
     private SalesCattleService salesCattleService;
 
+    @Transactional
     @PostMapping("/saveSalesCattle")
-    public Result add(@RequestBody SalesCattle salesCattle){
-        SalesCattle one = salesCattleService.getOne(new QueryWrapper<SalesCattle>().eq("year", salesCattle.getYear()).eq("quarter", salesCattle.getQuarter()));
-        if (ObjectUtil.isNotEmpty(one)){
-            one.setQuarter(salesCattle.getQuarter());
-            one.setQuarterName(salesCattle.getQuarterName());
-            one.setSalesCount(salesCattle.getSalesCount());
-            one.setSalesMoney(salesCattle.getSalesMoney());
-            one.setYear(salesCattle.getYear());
-            salesCattleService.updateById(one);
-        }else {
+    public Result add(@RequestBody SalesCattleVo salesCattleVo, HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(salesCattleVo.getFarmCode(), request);
+        List<SalesCattle> salesCattles = salesCattleVo.getSalesCattles();
+        salesCattleService.remove(new QueryWrapper<SalesCattle>().eq("farm_code",farmCode));
+        System.out.println(farmCode);
+        for (SalesCattle salesCattle : salesCattles) {
+            salesCattle.setFarmCode(farmCode);
             salesCattleService.save(salesCattle);
         }
         return new Result(10000,"添加成功",true);
@@ -59,8 +62,9 @@ public class SalesCattleController {
         return new Result(10000,"删除成功",true);
     }
     @PostMapping("/getSalesCattle")
-    public  Result list(@RequestBody SalesCattle salesCattle){
-        List<SalesCattle> list = salesCattleService.list(new QueryWrapper<SalesCattle>().orderByDesc("year").orderByDesc("quarter"));
+    public  Result list(@RequestBody SalesCattle salesCattle,HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(salesCattle.getFarmCode(), request);
+        List<SalesCattle> list = salesCattleService.list(new QueryWrapper<SalesCattle>().eq("farm_code",farmCode).orderByDesc("year").orderByDesc("quarter"));
         if (ObjectUtil.isEmpty(list)){
             return new Result(ResultCode.SUCCESS,new ArrayList<>());
         }

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

@@ -6,12 +6,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.Supervise;
 import com.huimv.cattle.pojo.VaccineDelivery;
 import com.huimv.cattle.service.SuperviseService;
+import com.huimv.cattle.utils.FarmCodeUtils;
+import com.huimv.cattle.utils.SuperServiseUtils;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 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.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,25 +30,29 @@ import java.util.Map;
  */
 @CrossOrigin
 @RestController
-@RequestMapping("/supervise")
+@RequestMapping("/v1.0.0/supervise")
 public class SuperviseController {
 
     @Autowired
     private SuperviseService superviseService;
 
     @PostMapping("/saveSupervise")
-    public Result add(@RequestBody Supervise supervise){
-        Supervise superviseName = superviseService.getOne(new QueryWrapper<Supervise>().eq("supervise_name", supervise.getSuperviseName()));
-        if (ObjectUtil.isNotEmpty(superviseName)){
-            superviseName.setSuperviseCode(supervise.getSuperviseCode());
-            superviseName.setSuperviseData(supervise.getSuperviseData());
-            superviseName.setSuperviseName(supervise.getSuperviseName());
-            superviseService.updateById(superviseName);
-        }else {
+    @Transactional
+    public Result add(@RequestBody Map<String,String> paramMap, HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(paramMap.get("farmCode"), request);
+        superviseService.remove(new QueryWrapper<Supervise>().eq("farm_code", farmCode));
+        for (String key : paramMap.keySet()) {
+            String value = paramMap.get(key);
+            Supervise supervise = new Supervise();
+            supervise.setSuperviseCode(key);
+            supervise.setSuperviseName(SuperServiseUtils.getSuperServise(key));
+            supervise.setSuperviseData(value);
+            supervise.setFarmCode(farmCode);
             superviseService.save(supervise);
         }
         return new Result(10000,"添加成功",true);
     }
+
     @PostMapping("/updateSupervise")
     public  Result update(@RequestBody Supervise supervise){
         superviseService.updateById(supervise);
@@ -59,12 +68,9 @@ public class SuperviseController {
         return new Result(10000,"删除成功",true);
     }
     @PostMapping("/getSupervise")
-    public  Result list(@RequestBody Supervise supervise){
-        List<Supervise> list = superviseService.list(new QueryWrapper<Supervise>().orderByDesc("num"));
-        if (ObjectUtil.isEmpty(list)){
-            return new Result(ResultCode.SUCCESS,new ArrayList<>());
-        }
-        return new Result(ResultCode.SUCCESS,list);
+    public  Result list(@RequestBody Supervise supervise, HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(supervise.getFarmCode(),   request);
+        return   superviseService.getSupervise(farmCode);
     }
 
 }

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

@@ -25,7 +25,7 @@ public class IndustryOutput implements Serializable {
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private Integer year;
+    private String year;
 
     private BigDecimal salesMoney;
 

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

@@ -25,7 +25,7 @@ public class SalesCattle implements Serializable {
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private Integer year;
+    private String year;
 
     private String quarterName;
 

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

@@ -0,0 +1,20 @@
+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;
+    private String farmCode ;
+}

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

@@ -0,0 +1,21 @@
+package com.huimv.cattle.pojo.vo;
+
+
+import com.huimv.cattle.pojo.SalesCattle;
+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 {
+
+    private List<SalesCattle> salesCattles;
+    private String farmCode ;
+}

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

@@ -2,6 +2,7 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.Supervise;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface SuperviseService extends IService<Supervise> {
 
+    Result getSupervise(String farmCode);
 }

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

@@ -52,7 +52,7 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
                 .orderByDesc("year"));
         if (industryOutputs.isEmpty()) {
             IndustryOutput industryOutput = new IndustryOutput();
-            industryOutput.setYear(Integer.valueOf(dateUtil.getThisYear()));
+            industryOutput.setYear(dateUtil.getThisYear());
             industryOutput.setFarmCode(farmCode);
             industryOutputMapper.insert(industryOutput);
             industryOutputs.add(industryOutput);
@@ -77,7 +77,7 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
         for (int a = listJa.size()-1; a >= 0 ; a--){
             JSONObject jsonObject = listJa.getJSONObject(a);
             IndustryOutput industryOutput = new IndustryOutput();
-            industryOutput.setYear(jsonObject.getInteger("year"));
+            industryOutput.setYear(jsonObject.getString("year"));
             industryOutput.setSalesMoney(jsonObject.getBigDecimal("salesMoney"));
             industryOutput.setFarmCode(farmCode);
             industryOutputMapper.insert(industryOutput);
@@ -86,11 +86,11 @@ public class IndustryOutputServiceImpl extends ServiceImpl<IndustryOutputMapper,
     }
 
     private Boolean checkRepeat(List<IndustryOutput> list){
-        List<Integer> collectionOptionList = new ArrayList<>();
+        List<String> collectionOptionList = new ArrayList<>();
         for (IndustryOutput a : list){
             collectionOptionList.add(a.getYear());
         }
-        Set<Integer> set = new HashSet<>(collectionOptionList);
+        Set<String> set = new HashSet<>(collectionOptionList);
         return collectionOptionList.size()!= set.size();
     }
 }

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

@@ -1,11 +1,19 @@
 package com.huimv.cattle.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.Supervise;
 import com.huimv.cattle.mapper.SuperviseMapper;
 import com.huimv.cattle.service.SuperviseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class SuperviseServiceImpl extends ServiceImpl<SuperviseMapper, Supervise> implements SuperviseService {
 
+    @Autowired
+    private SuperviseMapper superviseMapper;
+    @Override
+    public Result getSupervise(String farmCode) {
+        Map map = new HashMap();
+        map.put("ZCL",superviseGatValue(farmCode ,"ZCL"));
+        map.put("ZCLCL",superviseGatValue(farmCode ,"ZCLCL"));
+        map.put("HZNH",superviseGatValue(farmCode ,"HZNH"));
+        map.put("LJFFNL",superviseGatValue(farmCode ,"LJFFNL"));
+        map.put("KCLSL",superviseGatValue(farmCode ,"KCLSL"));
+        map.put("CLCL",superviseGatValue(farmCode ,"CLCL"));
+        map.put("CLML",superviseGatValue(farmCode ,"CLML"));
+        map.put("WCLSL",superviseGatValue(farmCode ,"WCLSL"));
+        map.put("NCUL",superviseGatValue(farmCode ,"NCUL"));
+        map.put("FWXC",superviseGatValue(farmCode ,"FWXC"));
+        map.put("NMZS",superviseGatValue(farmCode ,"NMZS"));
+        map.put("QYZS",superviseGatValue(farmCode ,"QYZS"));
+        return new Result(ResultCode.SUCCESS,map);
+    }
+
+    private String superviseGatValue(String farmCode,String key) {
+        QueryWrapper<Supervise> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_code",farmCode);
+        wrapper.eq("supervise_code",key);
+        Supervise supervise = superviseMapper.selectOne(wrapper);
+        if (ObjectUtil.isEmpty(supervise)){
+            return "0";
+        }else {
+            return supervise.getSuperviseCode();
+        }
+    }
+
 }

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

@@ -155,7 +155,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 //        String userId = paramMap.get("userId");
         String userId = TokenSign.getMemberIdByJwtToken(request)+"";
         List<SysMenu> myMenuList = new ArrayList<SysMenu>();
-        if (userId.equals("1")){
+        if ("1".equals(userId)){
             myMenuList = sysMenuMapper.selectList(new QueryWrapper<SysMenu>().orderByAsc("sort"));
         }else {
             myMenuList = sysMenuMapper.getMyMenu(userId);

huimv-cattle/src/main/java/com/huimv/cattle/utils/SuperServiseUtils.java

@@ -0,0 +1,35 @@
+package com.huimv.cattle.utils;
+
+
+public class SuperServiseUtils {
+    public static  String getSuperServise(String key){
+        switch (key){
+            case "ZCL":
+                return "总存栏";
+            case "ZCLCL":
+                return "总存栏产量";
+            case "HZNH":
+                return "合作农户";
+            case "LJFFNL":
+                return "累计发放牛量";
+            case "KCLSL":
+                return "可出栏数量";
+            case "CLCL":
+                return "出栏产量";
+            case "CLML":
+                return "出栏毛利";
+            case "WCLSL":
+                return "未出栏数量";
+            case "NCUL":
+                return "年出栏量";
+            case "FWXC":
+                return "服务乡村";
+            case "NMZS":
+                return "农民增收";
+            case "QYZS":
+                return "企业增收";
+            default:
+                return "";
+        }
+    }
+}