大屏弹窗修改

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/BaseDuckInfoVo.java

@@ -0,0 +1,130 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_duck_info")
+public class BaseDuckInfoVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String duckNum;
+
+    /**
+     * 1北京鸭、2连城白鸭、3山麻鸭、4攸县麻鸭、5白改鸭、6缙云麻鸭、7绍兴鸭(带圈白翼梢)、8绍兴鸭(红毛绿翼梢)、9绍兴鸭(白羽绍鸭)
+     */
+    private Integer duckBreed;
+
+    /**
+     * 0雄性，1雌性
+     */
+    private Integer duckSex;
+
+    /**
+     * 出生地
+     */
+    private String duckBirthplace;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date duckBirthday;
+
+    /**
+     * 基因型
+     */
+    private String genotype;
+
+    /**
+     * 当前体重
+     */
+    private BigDecimal nowWeight;
+
+    /**
+     * 位置 id
+     */
+    private Integer unitId;
+
+    /**
+     * 位置
+     */
+    private String unitName;
+
+    //饲养环境
+    private  String breedingEnv;
+
+    //特殊需求
+    private  String specialNeeds;
+
+    // 母系 基因
+    private  String motherGenotype;
+
+    // 父系 基因
+    private  String fatherGenotype;
+
+
+    /**
+     * 出壳率
+     */
+    private BigDecimal hatchRate;
+
+    /**
+     * 日龄
+     */
+    private Integer dayAge;
+
+    /**
+     * 父系信息
+     */
+    private String fatherNum;
+
+    /**
+     * 母系信息
+     */
+    private String motherNum;
+
+    /**
+     * 鸭子图片
+     */
+    private String duckImgUrl;
+
+    /**
+     * 0未出笼 1已出笼
+     */
+    private Integer isCage;
+
+    private Integer farmId;
+
+    private String unitList;
+
+    private Date outTime;
+
+    private Integer eggNum;
+
+
+
+}

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

@@ -1,5 +1,8 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,6 +12,7 @@ import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.common.utils.UploadImage;
 import com.huimv.guowei.admin.entity.*;
+import com.huimv.guowei.admin.entity.vo.BaseDuckInfoVo;
 import com.huimv.guowei.admin.entity.vo.EnvMoveCallVo;
 import com.huimv.guowei.admin.entity.vo.EnvRegularCallFeedingVo;
 import com.huimv.guowei.admin.mapper.*;
@@ -56,6 +60,8 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
     private UploadImage uploadImage;
     @Autowired
     private BaseDuckBreedImgMapper imgMapper;
+    @Autowired
+    private DepartureMapper departureMapper;
 
     @Override
     public Result listDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -213,6 +219,31 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("duck_num", duckNum).eq("farm_id", farmId);
         BaseDuckInfo baseDuckInfo = duckInfoMapper.selectOne(queryWrapper);//鸭只档案
+        BaseDuckInfoVo baseDuckInfoVo = new BaseDuckInfoVo();
+        BeanUtil.copyProperties(baseDuckInfo, baseDuckInfoVo);
+
+        QueryWrapper<Departure> departureQueryWrapper = new QueryWrapper<>();
+        departureQueryWrapper.eq("duck_num", baseDuckInfo.getDuckNum());
+        Departure departure = departureMapper.selectOne(departureQueryWrapper);//离场
+
+        QueryWrapper<EnvRegularCallEgg> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId).eq("duck_num", duckNum);
+        queryWrapper2.select(" IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum");
+        EnvRegularCallEgg egg = eggMapper.selectOne(queryWrapper2);//产蛋数量
+
+        if (ObjectUtil.isEmpty(departure)) {
+            Date birthday = baseDuckInfo.getDuckBirthday();
+            DateTime day = DateUtil.offsetDay(birthday, 504);
+            baseDuckInfoVo.setOutTime(day);
+        } else {
+            baseDuckInfoVo.setOutTime(departure.getDate());
+        }
+
+        if (ObjectUtil.isEmpty(egg)) {
+            baseDuckInfoVo.setEggNum(0);
+        } else {
+            baseDuckInfoVo.setEggNum(egg.getEggNum());
+        }
 
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum);
@@ -223,7 +254,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             list.add(s);
         }
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("duckInfo", baseDuckInfo);
+        jsonObject.put("duckInfo", baseDuckInfoVo);
         jsonObject.put("feedInfo", list);
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
@@ -232,14 +263,17 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
     public Result listDuckByScreen2(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String duckNum = paramsMap.get("duckNum");
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE - 7));
+       /* Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE - 7));*/
         QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("duck_num", duckNum).ge("call_date", calendar.getTime());
+        queryWrapper.eq("farm_id", farmId).eq("duck_num", duckNum)
+        /*.ge("call_date", calendar.getTime())*/;
         List<EnvMoveCallVo> envMoveCallVos = moveCallMapper.listScreen(queryWrapper);
 
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum).ge("call_date", calendar.getTime());
+        queryWrapper1.eq("farm_id", farmId).eq("duck_num", duckNum)
+        /*.ge("call_date", calendar.getTime())*/;
+
         List<EnvRegularCallFeedingVo> envRegularCallFeedingVos = feedingMapper.listScreen(queryWrapper1);
 
         JSONObject jsonObject = new JSONObject();