apiservice接口编写(getKeeper)

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/controller/PigController.java

@@ -1,6 +1,8 @@
 package com.huimv.apiservice.controller;
 
 import com.huimv.apiservice.entity.vo.PigBaseVo;
+import com.huimv.apiservice.entity.vo.PigImageVo;
+import com.huimv.apiservice.entity.vo.PigPedigreeVo;
 import com.huimv.apiservice.service.PigService;
 import com.huimv.common.utils.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -25,14 +28,46 @@ public class PigController {
 
 
     @RequestMapping("/getPigInfo")
-    public R getPigInfo(@RequestParam("accessToken") String accessToken,
-                        @RequestParam("pigEarTagNo") Integer pigEarTagNo) {
+    public R getPigInfo(@RequestParam(value = "accessToken", required = false) String accessToken,
+                        @RequestParam("pigEarTagNo") String pigEarTagNo) {
+        //TODO token校验
+        PigBaseVo pigBaseVo = pigService.getPigInfoByEarTagNo(pigEarTagNo);
+        return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigBaseVo);
+    }
 
+    @RequestMapping("/getImage")
+    public R getImage(@RequestParam(value = "accessToken", required = false) String accessToken,
+                      @RequestParam("pigEarTagNo") String pigEarTagNo) {
+        //TODO token校验
+        PigImageVo pigImageVo = pigService.getImageByEarTagNo(pigEarTagNo);
+        return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigImageVo);
+    }
 
-        PigBaseVo pigBaseVo = pigService.getPigInfoByEarTagNo(pigEarTagNo);
+    @RequestMapping("/getListByBreed")
+    public R getListByBreed(@RequestParam(value = "accessToken", required = false) String accessToken,
+                            @RequestParam("breedName") String breedName) {
+        //TODO token校验
+        List<PigBaseVo> pigBaseVoList = pigService.getListByBreed(breedName);
+        return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigBaseVoList);
+    }
 
-        return Objects.requireNonNull(R.ok().put("code", 1000)).put("data",pigBaseVo);
+    @RequestMapping("/getPigPedigree")
+    public R getPigPedigree(@RequestParam(value = "accessToken", required = false) String accessToken,
+                            @RequestParam("pigEarTagNo") String pigEarTagNo) {
+        //TODO token校验
+        PigPedigreeVo pigPedigreeVo = pigService.getPigPedigree(pigEarTagNo);
+        return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigPedigreeVo);
     }
 
+    @RequestMapping("/getKeeper")
+    public R getKeeper(@RequestParam(value = "accessToken", required = false) String accessToken,
+                            @RequestParam("pigEarTagNo") String pigEarTagNo) {
+        //TODO token校验
+        PigPedigreeVo pigPedigreeVo = pigService.getKeeper(pigEarTagNo);
+        return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigPedigreeVo);
+    }
+
+
+
 
 }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/dao/PigDao.java

@@ -3,6 +3,7 @@ package com.huimv.apiservice.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.apiservice.entity.YearPigBaseEntity;
 import org.mapstruct.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Author yinhao
@@ -10,5 +11,6 @@ import org.mapstruct.Mapper;
  * @Description
  */
 @Mapper
+@Repository
 public interface PigDao extends BaseMapper<YearPigBaseEntity> {
 }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/dao/PigstyDao.java

@@ -0,0 +1,19 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.PigstyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 猪舍表
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+@Repository
+public interface PigstyDao extends BaseMapper<PigstyEntity> {
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/dao/YearPigHistoryImgDao.java

@@ -0,0 +1,20 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.YearPigHistoryImgEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 年猪历史照片
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+@Repository
+public interface YearPigHistoryImgDao extends BaseMapper<YearPigHistoryImgEntity> {
+
+    String getLatestImgByPigEarTagNo(String pigEarTagNo);
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/dao/YearPigPedigreeDao.java

@@ -0,0 +1,19 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.YearPigPedigreeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 年猪谱系
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+@Repository
+public interface YearPigPedigreeDao extends BaseMapper<YearPigPedigreeEntity> {
+	
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PigstyEntity.java

@@ -0,0 +1,54 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 猪舍表
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Data
+@TableName("mgt_pigsty")
+public class PigstyEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 猪舍id
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 猪舍编号
+     */
+    private String number;
+    /**
+     * 牧场id
+     */
+    private Integer pastureId;
+    /**
+     * 养殖员名称
+     */
+    private String feeder;
+    /**
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date gmtModified;
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/TestEntity.java

@@ -1,9 +0,0 @@
-package com.huimv.apiservice.entity;
-
-/**
- * @Author yinhao
- * @Date 2021/5/8 16:47
- * @Description
- */
-public class TestEntity {
-}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigBaseEntity.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 年猪基本
+ * 年猪基本信息
  *
  * @author yinhao
  * @email yinhao@163.com
@@ -55,7 +55,7 @@ public class YearPigBaseEntity implements Serializable {
     /**
     * 品种
     */
-    private String variety;
+    private String breed;
     /**
      * 删除状态 0正常 1已删除
      */

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigHistoryImgEntity.java

@@ -0,0 +1,50 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 年猪历史照片
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Data
+@TableName("mgt_year_pig_history_img")
+public class YearPigHistoryImgEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 耳标号
+     */
+    private String eartag;
+    /**
+     * 照片
+     */
+    private String img;
+    /**
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date gmtModified;
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigPedigreeEntity.java

@@ -0,0 +1,54 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 年猪谱系
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Data
+@TableName("mgt_year_pig_pedigree")
+public class YearPigPedigreeEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 子猪耳标号
+     */
+    private String pigletEartag;
+    /**
+     * 公猪耳标号
+     */
+    private String boarEartag;
+    /**
+     * 母猪耳标号
+     */
+    private String sowEartag;
+    /**
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date gmtModified;
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/vo/PigBaseVo.java

@@ -1,7 +1,10 @@
 package com.huimv.apiservice.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author yinhao
  * @Date 2021/5/8 16:50
@@ -10,16 +13,35 @@ import lombok.Data;
 @Data
 public class PigBaseVo {
 
-    private String weight;
+    /**
+     * 体重
+     */
+    private Double weight;
 
+    /**
+     * 日龄
+     */
     private Integer dayAge;
 
+    /**
+     * 品种
+     */
     private String breed;
 
-    private String birthday;
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date birthday;
 
+    /**
+     * 养殖场名称
+     */
     private String pigsty;
 
+    /**
+     * 体温
+     */
     private String bodyTemperature;
 
 

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/vo/PigImageVo.java

@@ -0,0 +1,24 @@
+package com.huimv.apiservice.entity.vo;
+
+import lombok.Data;
+
+/**
+ * <p>
+ *  猪照片/视频
+ * </p>
+ * @author yinhao
+ * @date 2021/5/10 10:43
+ */
+@Data
+public class PigImageVo {
+
+    /**
+     * 耳标号
+     */
+    private String pigEarTagNo;
+
+    /**
+     * 图片内容
+     */
+    private String imageData;
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/vo/PigKeeperVo.java

@@ -0,0 +1,13 @@
+package com.huimv.apiservice.entity.vo;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @Date 2021/5/10 15:35
+ * @Description
+ */
+public class PigKeeperVo {
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/vo/PigPedigreeFatherVo.java

@@ -0,0 +1,24 @@
+package com.huimv.apiservice.entity.vo;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 谱系-父亲信息
+ * </p>
+ * @author yinhao
+ * @date 2021/5/10 13:35
+ */
+@Data
+public class PigPedigreeFatherVo {
+
+    /**
+     * 品种
+     */
+    private String breed;
+
+    /**
+     * 产地
+     */
+    private String originPlace;
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/vo/PigPedigreeMotherVo.java

@@ -0,0 +1,43 @@
+package com.huimv.apiservice.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author yinhao
+ * @Date 2021/5/10 13:33
+ * @Description
+ */
+@Data
+public class PigPedigreeMotherVo {
+
+    /**
+     * 品种
+     */
+    private String breed;
+
+    /**
+     * 体重
+     */
+    private Double weight;
+
+    /**
+     * 产地
+     */
+    private String originPlace;
+
+    /**
+     * 怀孕日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date pregnancyDate;
+
+    /**
+     * 产子个数
+     */
+    private Integer childCount;
+
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/vo/PigPedigreeVo.java

@@ -0,0 +1,37 @@
+package com.huimv.apiservice.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author yinhao
+ * @Date 2021/5/10 13:30
+ * @Description
+ */
+@Data
+public class PigPedigreeVo {
+
+    /**
+     * 品种
+     */
+    private String breed;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date birthday;
+
+    /**
+     * 母亲信息
+     */
+    private PigPedigreeMotherVo mother;
+
+    /**
+     * 父亲信息
+     */
+    private PigPedigreeFatherVo father;
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/service/PigService.java

@@ -3,6 +3,10 @@ package com.huimv.apiservice.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.apiservice.entity.YearPigBaseEntity;
 import com.huimv.apiservice.entity.vo.PigBaseVo;
+import com.huimv.apiservice.entity.vo.PigImageVo;
+import com.huimv.apiservice.entity.vo.PigPedigreeVo;
+
+import java.util.List;
 
 /**
  * @Author yinhao
@@ -12,5 +16,11 @@ import com.huimv.apiservice.entity.vo.PigBaseVo;
 public interface PigService extends IService<YearPigBaseEntity> {
 
 
-    PigBaseVo getPigInfoByEarTagNo(Integer pigEarTagNo);
+    PigBaseVo getPigInfoByEarTagNo(String pigEarTagNo);
+
+    PigImageVo getImageByEarTagNo(String pigEarTagNo);
+
+    List<PigBaseVo> getListByBreed(String breedName);
+
+    PigPedigreeVo getPigPedigree(String pigEarTagNo);
 }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/service/impl/PigServiceImpl.java

@@ -1,32 +1,166 @@
 package com.huimv.apiservice.service.impl;
 
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.apiservice.dao.PigDao;
+import com.huimv.apiservice.dao.PigstyDao;
+import com.huimv.apiservice.dao.YearPigHistoryImgDao;
+import com.huimv.apiservice.dao.YearPigPedigreeDao;
+import com.huimv.apiservice.entity.PigstyEntity;
 import com.huimv.apiservice.entity.YearPigBaseEntity;
-import com.huimv.apiservice.entity.vo.PigBaseVo;
+import com.huimv.apiservice.entity.YearPigPedigreeEntity;
+import com.huimv.apiservice.entity.vo.*;
 import com.huimv.apiservice.service.PigService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Author yinhao
  * @Date 2021/5/8 17:22
  * @Description
  */
 @Service
-public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity>  implements PigService {
+public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> implements PigService {
+
+    @Autowired
+    private PigstyDao pigstyDao;
+
+    @Autowired
+    private YearPigHistoryImgDao yearPigHistoryImgDao;
+
+    @Autowired
+    private YearPigPedigreeDao yearPigPedigreeDao;
+
+
+    @Override
+    public PigBaseVo getPigInfoByEarTagNo(String pigEarTagNo) {
+
+        LambdaQueryWrapper<YearPigBaseEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(YearPigBaseEntity::getEartag, pigEarTagNo);
+
+        YearPigBaseEntity yearPigBaseEntity = baseMapper.selectOne(lambdaQueryWrapper);
+
+
+        PigBaseVo pigBaseVo = new PigBaseVo();
+//        BeanUtil.copyProperties(yearPigBaseEntity,pigBaseVo);
+        if (ObjectUtil.isNotNull(yearPigBaseEntity)) {
+            pigBaseVo.setWeight(yearPigBaseEntity.getWeight());
+            pigBaseVo.setDayAge(yearPigBaseEntity.getDayAge());
+            pigBaseVo.setBreed(yearPigBaseEntity.getBreed());
+            //虚拟数据 待填充
+            pigBaseVo.setBirthday(new Date());
+            PigstyEntity pigstyEntity = pigstyDao.selectById(yearPigBaseEntity.getUnitId());
+            String number = pigstyEntity.getNumber();
+            if (StringUtils.isNotEmpty(number)) {
+                pigBaseVo.setPigsty(number);
+            }
+            //虚拟数据 待填充
+            pigBaseVo.setBodyTemperature("100");
+        }
+        return pigBaseVo;
+    }
+
+    @Override
+    public PigImageVo getImageByEarTagNo(String pigEarTagNo) {
 
+        PigImageVo pigImageVo = new PigImageVo();
+
+        pigImageVo.setPigEarTagNo(pigEarTagNo);
+        String img = yearPigHistoryImgDao.getLatestImgByPigEarTagNo(pigEarTagNo);
+        if (StringUtils.isNotEmpty(img)) {
+            String encodeImg = Base64.encode(img);
+            pigImageVo.setImageData(encodeImg);
+        }
+        return pigImageVo;
+    }
+
+    @Override
+    public List<PigBaseVo> getListByBreed(String breedName) {
+        LambdaQueryWrapper<YearPigBaseEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(YearPigBaseEntity::getBreed, breedName);
+        List<YearPigBaseEntity> yearPigBaseEntityList = baseMapper.selectList(lambdaQueryWrapper);
+
+        List<PigBaseVo> pigBaseVoList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(yearPigBaseEntityList)) {
+            for (YearPigBaseEntity yearPigBaseEntity : yearPigBaseEntityList) {
+                PigBaseVo pigBaseVo = new PigBaseVo();
+                pigBaseVo.setWeight(yearPigBaseEntity.getWeight());
+                pigBaseVo.setDayAge(yearPigBaseEntity.getDayAge());
+                pigBaseVo.setBreed(yearPigBaseEntity.getBreed());
+                //虚拟数据 待填充
+                pigBaseVo.setBirthday(new Date());
+                PigstyEntity pigstyEntity = pigstyDao.selectById(yearPigBaseEntity.getUnitId());
+                String number = pigstyEntity.getNumber();
+                if (StringUtils.isNotEmpty(number)) {
+                    pigBaseVo.setPigsty(number);
+                }
+                //虚拟数据 待填充
+                pigBaseVo.setBodyTemperature("100");
+                pigBaseVoList.add(pigBaseVo);
+            }
+        }
+        return pigBaseVoList;
+    }
 
     @Override
-    public PigBaseVo getPigInfoByEarTagNo(Integer pigEarTagNo) {
+    public PigPedigreeVo getPigPedigree(String pigEarTagNo) {
 
         LambdaQueryWrapper<YearPigBaseEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(YearPigBaseEntity::getEartag,pigEarTagNo);
+        lambdaQueryWrapper.eq(YearPigBaseEntity::getEartag, pigEarTagNo);
 
         YearPigBaseEntity yearPigBaseEntity = baseMapper.selectOne(lambdaQueryWrapper);
+        PigPedigreeVo pigPedigreeVo = new PigPedigreeVo();
+
+        if (ObjectUtil.isNotNull(yearPigBaseEntity)) {
+            pigPedigreeVo.setBreed(yearPigBaseEntity.getBreed());
+            //虚拟数据 待填充
+            pigPedigreeVo.setBirthday(new Date());
 
-        return null;
+            LambdaQueryWrapper<YearPigPedigreeEntity> lambdaQuery = Wrappers.lambdaQuery();
+            lambdaQuery.eq(YearPigPedigreeEntity::getPigletEartag, pigEarTagNo);
+            YearPigPedigreeEntity yearPigPedigreeEntity = yearPigPedigreeDao.selectOne(lambdaQuery);
+
+            String motherEarTag = yearPigPedigreeEntity.getSowEartag();
+            String fatherEarTag = yearPigPedigreeEntity.getBoarEartag();
+
+            lambdaQueryWrapper.clear();
+            lambdaQueryWrapper.eq(YearPigBaseEntity::getEartag,motherEarTag);
+            YearPigBaseEntity mother = baseMapper.selectOne(lambdaQueryWrapper);
+            PigPedigreeMotherVo pigPedigreeMotherVo = new PigPedigreeMotherVo();
+            if (ObjectUtil.isNotNull(mother)) {
+                pigPedigreeMotherVo.setBreed(mother.getBreed());
+                pigPedigreeMotherVo.setWeight(mother.getWeight());
+                //虚拟数据 待填充
+                pigPedigreeMotherVo.setPregnancyDate(new Date());
+                pigPedigreeMotherVo.setChildCount(10);
+                pigPedigreeMotherVo.setOriginPlace("产地信息");
+            }
+            pigPedigreeVo.setMother(pigPedigreeMotherVo);
+
+            lambdaQuery.clear();
+            lambdaQueryWrapper.eq(YearPigBaseEntity::getEartag,fatherEarTag);
+            PigPedigreeFatherVo pigPedigreeFatherVo = new PigPedigreeFatherVo();
+            YearPigBaseEntity father = baseMapper.selectOne(lambdaQueryWrapper);
+            if (ObjectUtil.isNotNull(father)) {
+                pigPedigreeFatherVo.setBreed(father.getBreed());
+                pigPedigreeFatherVo.setOriginPlace("产地信息");
+            }
+            pigPedigreeVo.setFather(pigPedigreeFatherVo);
+        }
+
+        return pigPedigreeVo;
     }
+
+
+
+
 }

huimv-smart-apiservice/src/main/resources/application-dev.yml

@@ -91,5 +91,10 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 
+
 renyang:
   client: 20210501
+
+#logging:
+#  level:
+#    com.alibaba.druid.pool.DruidAbstractDataSource: error

huimv-smart-apiservice/src/main/resources/logback-spring.xml

@@ -4,11 +4,13 @@
     <logger name="org.springframework.web" level="INFO"/>
     <logger name="org.springboot.sample" level="TRACE" />
 
+
     <!-- 开发、测试环境 -->
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO" />
         <logger name="com.huimv" level="DEBUG" />
+        <logger name="com.alibaba.druid.pool" level="ERROR"/>
     </springProfile>
 
     <!-- 生产环境 -->

huimv-smart-apiservice/src/main/resources/mapper/apiservice/YearPigBaseDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.huimv.apiservice.dao.PigDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.huimv.management.entity.YearPigBaseEntity" id="yearPigBaseMap">
+    <resultMap type="com.huimv.apiservice.entity.YearPigBaseEntity" id="yearPigBaseMap">
         <result property="id" column="id"/>
         <result property="eartag" column="eartag"/>
         <result property="dayAge" column="day_age"/>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/YearPigHistoryImgDao.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.apiservice.dao.YearPigHistoryImgDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.YearPigHistoryImgEntity" id="yearPigHistoryImgMap">
+        <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
+        <result property="img" column="img"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+    <select id="getLatestImgByPigEarTagNo" parameterType="string" resultType="java.lang.String">
+        SELECT img FROM mgt_year_pig_history_img WHERE eartag = #{pigEarTagNo} ORDER BY id DESC limit 1;
+    </select>
+
+
+</mapper>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/YearPigPedigreeDao.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.apiservice.dao.YearPigPedigreeDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.YearPigPedigreeEntity" id="yearPigPedigreeMap">
+        <result property="id" column="id"/>
+        <result property="pigletEartag" column="piglet_eartag"/>
+        <result property="boarEartag" column="boar_eartag"/>
+        <result property="sowEartag" column="sow_eartag"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-management/src/main/java/com/huimv/management/entity/YearPigBaseEntity.java

@@ -56,7 +56,7 @@ public class YearPigBaseEntity implements Serializable {
     /**
     * 品种
     */
-    private String variety;
+    private String breed;
     /**
      * 删除状态 0正常 1已删除
      */