大屏控制展示修改2

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

@@ -1,12 +1,15 @@
 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.Breed;
 import com.huimv.guowei.admin.entity.Departure;
+import com.huimv.guowei.admin.entity.DuckHealthInfo;
+import com.huimv.guowei.admin.service.IBaseDuckInfoService;
 import com.huimv.guowei.admin.service.IBreedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -16,6 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -33,6 +39,8 @@ public class BreedController {
 
     @Autowired
     private IBreedService breedService;
+    @Autowired
+    private IBaseDuckInfoService duckInfoService;
 
 
     @RequestMapping("/list")
@@ -50,7 +58,38 @@ public class BreedController {
     }
 
     @RequestMapping("/addDuck")
-    public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody Breed breed) {
+    public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody Breed breed) throws ParseException {
+        Date healthDate = breed.getDate();//发病时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        String format = sdf.format(date);
+        Date parse = sdf.parse(format);//今天日期
+        if (healthDate.getTime() > parse.getTime()) {
+            return new Result(10001, "配种日期不能晚于今日", false);
+        }
+        String maleNum = breed.getMaleNum();//雄鸭
+        String femaleNum = breed.getFemaleNum();//雌鸭
+        QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", breed.getFarmId()).eq("duck_num", maleNum);
+        BaseDuckInfo duckInfo = duckInfoService.getOne(queryWrapper);
+        QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", breed.getFarmId()).eq("duck_num", maleNum);
+        BaseDuckInfo duckInfo1 = duckInfoService.getOne(queryWrapper1);
+        if (ObjectUtil.isNotEmpty(duckInfo)) {
+            if (duckInfo.getDuckSex() == 0) {
+                breed.setMaleNum(maleNum);
+            } else {
+                return new Result(10001, "雌鸭编号不能填入雄鸭配种中！", false);
+            }
+        }
+        if (ObjectUtil.isNotEmpty(duckInfo1)) {
+            if (duckInfo.getDuckSex() == 0) {
+                breed.setFemaleNum(femaleNum);
+            } else {
+                return new Result(10001, "雄鸭编号不能填入雌鸭配种中！", false);
+            }
+        }
+
         breedService.save(breed);
         return new Result(10000, "添加成功！", true);
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseDuckInfoServiceImpl.java

@@ -247,9 +247,9 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             baseDuckInfoVo.setEggNum(egg.getEggNum());
         }
 
-        Date timesmorning = DataUill.getTimesmorning();
+        /*Date timesmorning = DataUill.getTimesmorning();*/
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum).ge("call_date",timesmorning);
+        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum)/*.ge("call_date",timesmorning)*/;
         List<EnvRegularCallFeeding> feedings = feedingMapper.listDay(queryWrapper1);
         JSONArray jsonArray = new JSONArray();
         for (EnvRegularCallFeeding feeding : feedings) {

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckHealthInfoServiceImpl.java

@@ -74,6 +74,17 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("duck_num", duckNum);
         BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);
+
+        Date healthDate = healthInfo.getHealthDate();//发病时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        String format = sdf.format(date);
+        Date parse = sdf.parse(format);//今天日期
+        if (healthDate.getTime() > parse.getTime()) {
+            return new Result(10001, "发病日期不能晚于今日！", false);
+        } else {
+            healthInfo.setHealthDate(healthDate);
+        }
         healthInfo.setDuckNum(baseDuckInfo.getDuckNum());
         healthInfo.setFarmId(farmId);
         healthInfo.setUnitId(baseDuckInfo.getUnitId());
@@ -112,5 +123,4 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
         return new Result(ResultCode.SUCCESS, healthInfoMapper.selectPage(page, queryWrapper));
     }
 
-
 }