app

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

@@ -81,6 +81,8 @@ public class BreedController {
         if (ObjectUtil.isNotEmpty(duckInfo)) {
             if (duckInfo.getDuckSex() == 0) {
                 breed.setMaleNum(maleNum);
+                breed.setMaleChiNum(duckInfo.getChiNum());
+                breed.setMaleJiaoNum(duckInfo.getJiaoNum());
             } else {
                 return new Result(10001, "雌鸭编号不能填入雄鸭配种中！", false);
             }
@@ -98,6 +100,8 @@ public class BreedController {
         if (ObjectUtil.isNotEmpty(duckInfo1)) {
             if (duckInfo1.getDuckSex() == 1) {
                 breed.setFemaleNum(femaleNum);
+                breed.setFemaleChiNum(duckInfo1.getChiNum());
+                breed.setFemaleJiaoNum(duckInfo1.getJiaoNum());
             } else {
                 return new Result(10001, "雄鸭编号不能填入雌鸭配种中！", false);
             }

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

@@ -60,6 +60,9 @@ public class DepartureController {
             return new Result(10001, "该鸭只已离场，无需再次离场！", false);
         }
         infoServiceOne.setIsCage(1);
+        departure.setChiNum(infoServiceOne.getChiNum());
+        departure.setJiaoNum(infoServiceOne.getJiaoNum());
+        departure.setBatchNum(infoServiceOne.getBatchNum());
         departureService.save(departure);
         infoService.updateById(infoServiceOne);
         return new Result(10000, "添加成功！", true);

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

@@ -38,13 +38,13 @@ public class DuckBodySizeInfoController {
 
     @PostMapping("/addInfo")
     public Result addInfo(@RequestBody DuckBodySizeInfo duckBodySizeInfo){
-        if (StringUtils.isEmpty(duckBodySizeInfo.getWingNum())){
-            duckBodySizeInfo.setWingNum("");
-        }
         BaseDuckInfo baseDuckInfo = baseDuckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("duck_num", duckBodySizeInfo.getDuckNum()));
         if (baseDuckInfo.getIsCage() == 1){
             return new Result(10001,"鸭只已离场!",false);
         }
+        duckBodySizeInfo.setChiNum(baseDuckInfo.getChiNum());
+        duckBodySizeInfo.setJiaoNum(baseDuckInfo.getJiaoNum());
+        duckBodySizeInfo.setBatchNum(baseDuckInfo.getBatchNum());
         duckBodySizeInfoService.save(duckBodySizeInfo);
         return Result.SUCCESS();
     }
@@ -67,7 +67,6 @@ public class DuckBodySizeInfoController {
         DuckBodySizeInfo duckBodySizeInfo = duckBodySizeInfoService.getById(paramsMap.get("id"));
         if (ObjectUtil.isEmpty(duckBodySizeInfo)){
             duckBodySizeInfo = new DuckBodySizeInfo();
-            duckBodySizeInfo.setWingNum("");
             duckBodySizeInfo.setBodyLength("");
             duckBodySizeInfo.setChestDeep("");
             duckBodySizeInfo.setChestWide("");

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

@@ -1,6 +1,8 @@
 package com.huimv.guowei.admin.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
@@ -45,6 +47,10 @@ public class DuckEggTextureInfoController {
         }
         Date determineTime = duckEggTextureInfo.getDetermineTime();
         Date layEggsTime = duckEggTextureInfo.getLayEggsTime();
+        duckEggTextureInfo.setDuckId(baseDuckInfo.getId());
+        duckEggTextureInfo.setChiNum(baseDuckInfo.getChiNum());
+        duckEggTextureInfo.setJiaoNum(baseDuckInfo.getJiaoNum());
+        duckEggTextureInfo.setBatchNum(baseDuckInfo.getBatchNum());
         if (layEggsTime.compareTo(determineTime) > 0){
             return new Result(10001,"测定日期不能早于产蛋日期!",false);
         }
@@ -88,4 +94,19 @@ public class DuckEggTextureInfoController {
         map.put("farmId", farmId);
         return duckEggTextureInfoService.importData(httpServletRequest, map, file);
     }
+    //生成鸭蛋编号
+    @PostMapping("/addEggsNum")
+    public Result addEggsNum(@RequestBody Map<String, String> paramsMap){
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<DuckEggTextureInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).orderByDesc("id").last(" limit 1");
+        DuckEggTextureInfo one = duckEggTextureInfoService.getOne(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        if (ObjectUtil.isEmpty(one)) {
+            jsonObject.put("eggNum", "100001");
+        } else {
+            jsonObject.put("eggNum", Integer.parseInt(one.getEggsNum()) + 1);
+        }
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
 }

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

@@ -56,6 +56,9 @@ public class DuckIncubateInfoController {
         if (duckIncubateInfo.getHealthyDuckNum() > duckIncubateInfo.getIncubateNum()){
             return new Result(10001,"健雏数应小于孵化数!",false);
         }
+        duckIncubateInfo.setChiNum(baseDuckInfo.getChiNum());
+        duckIncubateInfo.setJiaoNum(baseDuckInfo.getJiaoNum());
+        duckIncubateInfo.setBatchNum(baseDuckInfo.getBatchNum());
         duckIncubateInfoService.save(duckIncubateInfo);
         return Result.SUCCESS();
     }

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

@@ -72,6 +72,9 @@ public class EnvMoveCallController {
             envMoveCall.setCallDate(sdf2.parse(endDate));
             envMoveCall.setDayage(duckInfo.getDayAge());
             envMoveCall.setDuckId(duckInfo.getId());
+            envMoveCall.setChiNum(duckInfo.getChiNum());
+            envMoveCall.setJiaoNum(duckInfo.getJiaoNum());
+            envMoveCall.setBatchNum(duckInfo.getBatchNum());
             moveCallService.save(envMoveCall);
             return new Result(10000, "添加成功！", true);
         }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/Departure.java

@@ -59,4 +59,10 @@ public class Departure implements Serializable {
 
     private String unitName;
 
+    private String chiNum;
+
+    private String jiaoNum;
+
+    private String batchNum;
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckBodySizeInfo.java

@@ -53,10 +53,6 @@ public class DuckBodySizeInfo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date measureDate;
 
-    /**
-     * 翅号
-     */
-    private String wingNum;
 
     /**
      * 体斜长(cm)

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckHealthInfo.java

@@ -69,6 +69,11 @@ public class DuckHealthInfo implements Serializable {
 
     private String unitName;//笼位名称
 
+    private String chiNum;
+
+    private String jiaoNum;
+
+    private String batchNum;
 
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckIncubateInfo.java

@@ -96,5 +96,11 @@ public class DuckIncubateInfo implements Serializable {
 
     private Integer farmId;
 
+    private String chiNum;
+
+    private String jiaoNum;
+
+    private String batchNum;
+
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvMoveCall.java

@@ -68,4 +68,10 @@ public class EnvMoveCall implements Serializable {
     private String unitName;
     private Integer unitId;
 
+    private String chiNum;
+
+    private String jiaoNum;
+
+    private String batchNum;
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvRegularCallEgg.java

@@ -73,5 +73,10 @@ public class EnvRegularCallEgg implements Serializable {
     private Integer unitId;
     private String unitName;
 
+    private String chiNum;
+
+    private String jiaoNum;
+
+    private String batchNum;
 
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.Batch;
 import com.huimv.guowei.admin.entity.Departure;
 import com.huimv.guowei.admin.entity.DuckHealthInfo;
 import com.huimv.guowei.admin.mapper.BatchMapper;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -66,7 +68,9 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
     @Override
     public Result listBatch(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-
+        QueryWrapper<Batch> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        List<Batch> batches = batchMapper.selectList(queryWrapper);
         return null;
     }
 }

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

@@ -89,6 +89,9 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
         healthInfo.setDuckId(baseDuckInfo.getId());
         healthInfo.setUnitId(baseDuckInfo.getUnitId());
         healthInfo.setUnitName(baseDuckInfo.getUnitName());
+        healthInfo.setChiNum(baseDuckInfo.getChiNum());
+        healthInfo.setJiaoNum(baseDuckInfo.getJiaoNum());
+        healthInfo.setBatchNum(baseDuckInfo.getBatchNum());
         healthInfoMapper.insert(healthInfo);
         return new Result(ResultCode.SUCCESS);
     }

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

@@ -82,6 +82,9 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
         duckImmunityInfo.setUnitName(baseDuckInfo.getUnitName());
         duckImmunityInfo.setUnitId(baseDuckInfo.getUnitId());
         duckImmunityInfo.setDuckNum(baseDuckInfo.getDuckNum());
+        duckImmunityInfo.setChiNum(baseDuckInfo.getChiNum());
+        duckImmunityInfo.setJiaoNum(baseDuckInfo.getJiaoNum());
+        duckImmunityInfo.setBatchNum(baseDuckInfo.getBatchNum());
         infoMapper.insert(duckImmunityInfo);
         return new Result(ResultCode.SUCCESS);
     }

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

@@ -126,6 +126,9 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         egg.setEggNum(Integer.parseInt(eggNum));
         egg.setCallDate(sdf.parse(date));
         egg.setDuckId(Integer.parseInt(duckId));
+        egg.setChiNum(baseDuckInfo.getChiNum());
+        egg.setJiaoNum(baseDuckInfo.getJiaoNum());
+        egg.setBatchNum(baseDuckInfo.getBatchNum());
         eggMapper.insert(egg);
         return new Result(10000, "添加成功!", true);
     }