添加farmCode验证

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

@@ -36,15 +36,17 @@ public class InsureController {
     private InsureService insureService;
 
     @PostMapping("/saveInsure")
-    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);
-        }
+    public Result add(@RequestBody Insure insure , HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(insure.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);
+//        }
+        insure.setFarmCode(farmCode);
+        insureService.save(insure);
         return new Result(10000,"添加成功",true);
     }
     @PostMapping("/updateInsure")

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

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +32,7 @@ public class Insure implements Serializable {
 
     private BigDecimal amount;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date insuranceTime;
 
     private Integer period;

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

@@ -35,28 +35,28 @@ public class FarmKindCountServiceImpl extends ServiceImpl<FarmKindCountMapper, F
     @Override
     public Result getFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap) {
         String farmCode = paramsMap.get("farmCode");
-        if (StringUtils.isBlank(farmCode)){
+        if (StringUtils.isBlank(farmCode)) {
             farmCode = TokenSign.getFarmCode(request);
         }
         List<FarmKindCount> farmKindCount = farmKindCountMapper.getFarmKindCount(farmCode);
-        return new Result(ResultCode.SUCCESS,farmKindCount);
+        return new Result(ResultCode.SUCCESS, farmKindCount);
     }
 
     @Override
     public Result saveFarmKindCount(HttpServletRequest request, Map<String, String> paramsMap) {
         String farmCode = paramsMap.get("farmCode");
-        if (StringUtils.isBlank(farmCode)){
+        if (StringUtils.isBlank(farmCode)) {
             farmCode = TokenSign.getFarmCode(request);
         }
         String list = paramsMap.get("list");
         JSONArray listJa = JSONArray.parseArray(list);
         List<FarmKindCount> farmKindCountList = listJa.toJavaList(FarmKindCount.class);
         if (checkRepeat(farmKindCountList)) {
-            return new Result(10001,"有重复类型",false);
-        }else {
+            return new Result(10001, "有重复类型", false);
+        } else {
             farmKindCountMapper.deleteAll(farmCode);
         }
-        for (int a = listJa.size()-1; a >= 0 ; a--){
+        for (int a = listJa.size() - 1; a >= 0; a--) {
             JSONObject jsonObject = listJa.getJSONObject(a);
             FarmKindCount farmKindCount = new FarmKindCount();
             farmKindCount.setFarmKind(jsonObject.getString("farmKind"));
@@ -67,12 +67,12 @@ public class FarmKindCountServiceImpl extends ServiceImpl<FarmKindCountMapper, F
         return new Result(ResultCode.SUCCESS);
     }
 
-    private Boolean checkRepeat(List<FarmKindCount> list){
+    private Boolean checkRepeat(List<FarmKindCount> list) {
         List<String> collectionOptionList = new ArrayList<>();
-        for (FarmKindCount a : list){
+        for (FarmKindCount a : list) {
             collectionOptionList.add(a.getFarmKind());
         }
         Set<String> set = new HashSet<>(collectionOptionList);
-        return collectionOptionList.size()!= set.size();
+        return collectionOptionList.size() != set.size();
     }
 }