鸭只离场提醒

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckBodySizeInfoController.java

@@ -2,9 +2,12 @@ package com.huimv.guowei.admin.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.DuckBodySizeInfo;
+import com.huimv.guowei.admin.service.IBaseDuckInfoService;
 import com.huimv.guowei.admin.service.IDuckBodySizeInfoService;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +29,15 @@ import java.util.Map;
 public class DuckBodySizeInfoController {
     @Autowired
     private IDuckBodySizeInfoService duckBodySizeInfoService;
+    @Autowired
+    private IBaseDuckInfoService baseDuckInfoService;
 
     @PostMapping("/addInfo")
     public Result addInfo(@RequestBody DuckBodySizeInfo duckBodySizeInfo){
+        BaseDuckInfo baseDuckInfo = baseDuckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("duck_num", duckBodySizeInfo.getDuckNum()));
+        if (baseDuckInfo.getIsCage() == 1){
+            return new Result(10001,"鸭只已离场!",false);
+        }
         duckBodySizeInfoService.save(duckBodySizeInfo);
         return Result.SUCCESS();
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckEggTextureInfoController.java

@@ -37,10 +37,13 @@ public class DuckEggTextureInfoController {
         if (baseDuckInfo.getDuckSex() == 0){
             return new Result(10001,"雄鸭无法新增蛋质信息!",false);
         }
+        if (baseDuckInfo.getIsCage() == 1){
+            return new Result(10001,"鸭只已离场!",false);
+        }
         Date determineTime = duckEggTextureInfo.getDetermineTime();
         Date layEggsTime = duckEggTextureInfo.getLayEggsTime();
         if (layEggsTime.compareTo(determineTime) > 0){
-            return new Result(10001,"产蛋日期不能晚于测定日期!",false);
+            return new Result(10001,"测定日期不能早于产蛋日期!",false);
         }
         duckEggTextureInfoService.save(duckEggTextureInfo);
         return Result.SUCCESS();

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckIncubateInfoController.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -38,6 +39,14 @@ public class DuckIncubateInfoController {
         if (baseDuckInfo.getDuckSex() == 0){
             return new Result(10001,"雄鸭无法新增孵化信息!",false);
         }
+        if (baseDuckInfo.getIsCage() == 1){
+            return new Result(10001,"鸭只已离场!",false);
+        }
+        Date incubateTime = duckIncubateInfo.getIncubateTime();
+        Date layEggsTime = duckIncubateInfo.getLayEggsTime();
+        if (layEggsTime.compareTo(incubateTime) > 0){
+            return new Result(10001,"孵化日期不能早于产蛋日期!",false);
+        }
         duckIncubateInfoService.save(duckIncubateInfo);
         return Result.SUCCESS();
     }