修改接口文档后begin

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

@@ -25,7 +25,12 @@ public class PigController {
     @Autowired
     private PigService pigService;
 
-
+    /**
+     * 获取猪基本信息
+     * @param accessToken token
+     * @param pigEarTagNo 耳标号
+     * @return
+     */
     @RequestMapping("/getPigInfo")
     public R getPigInfo(@RequestParam(value = "accessToken", required = false) String accessToken,
                         @RequestParam("pigEarTagNo") String pigEarTagNo) {
@@ -34,6 +39,13 @@ public class PigController {
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigBaseVo);
     }
 
+
+    /**
+     *
+     * @param accessToken
+     * @param pigEarTagNo
+     * @return
+     */
     @RequestMapping("/getImage")
     public R getImage(@RequestParam(value = "accessToken", required = false) String accessToken,
                       @RequestParam("pigEarTagNo") String pigEarTagNo) {

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

@@ -3,6 +3,7 @@ package com.huimv.apiservice.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.apiservice.entity.AnimalHeatEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 体温信息表
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-05-07 15:32:42
  */
 @Mapper
+@Repository
 public interface AnimalHeatDao extends BaseMapper<AnimalHeatEntity> {
 	
 }

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

@@ -17,4 +17,5 @@ public interface PigDao extends BaseMapper<YearPigBaseEntity> {
 
     EmployeeEntity selectFeederInfoByPigEarTagNo(String pigEarTagNo);
 
+    String selectPastureNameByPigstyId(Integer pigstyId);
 }

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

@@ -37,12 +37,12 @@ public class PigBaseVo {
     /**
      * 养殖场名称
      */
-    private String pigsty;
+    private String pasture;
 
     /**
      * 体温
      */
-    private String bodyTemperature;
+    private Double bodyTemperature;
 
 
 }

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

@@ -18,7 +18,11 @@ import java.util.List;
  */
 public interface PigService extends IService<YearPigBaseEntity> {
 
-
+    /**
+     * 获取猪基本信息
+     * @param pigEarTagNo 耳标号
+     * @return
+     */
     PigBaseVo getPigInfoByEarTagNo(String pigEarTagNo);
 
     PigImageVo getImageByEarTagNo(String pigEarTagNo);

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

@@ -23,9 +23,7 @@ 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;
+import java.util.*;
 
 /**
  * @Author yinhao
@@ -39,6 +37,9 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
     private PigstyDao pigstyDao;
 
     @Autowired
+    private AnimalHeatDao animalHeatDao;
+
+    @Autowired
     private YearPigHistoryImgDao yearPigHistoryImgDao;
 
     @Autowired
@@ -53,34 +54,44 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
     @Override
     public PigBaseVo getPigInfoByEarTagNo(String pigEarTagNo) {
 
-        LambdaQueryWrapper<YearPigBaseEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(YearPigBaseEntity::getEartag, pigEarTagNo);
+        Map<String, Object> result = new HashMap<>(16);
+        List<Map<String, Double>> temperature = new ArrayList<>();
+        result.put("temperature", temperature);
 
-        YearPigBaseEntity yearPigBaseEntity = baseMapper.selectOne(lambdaQueryWrapper);
+        //构建根据耳标查询的表达式
+        LambdaQueryWrapper<YearPigBaseEntity> yearPigLambdaQuery = Wrappers.lambdaQuery();
+        yearPigLambdaQuery.eq(YearPigBaseEntity::getEartag, pigEarTagNo);
 
+        //根据耳标查询猪的信息
+        YearPigBaseEntity yearPigBaseEntity = baseMapper.selectOne(yearPigLambdaQuery);
 
+        //构建返回前端的VO对象
         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());
-            Integer unitId = yearPigBaseEntity.getUnitId();
-            PigstyEntity pigstyEntity = null;
-            if (unitId != null) {
-                 pigstyEntity = pigstyDao.selectById(unitId);
+            pigBaseVo.setBirthday(yearPigBaseEntity.getBirthday());
+
+            Integer pigstyId = yearPigBaseEntity.getPigstyId();
+            if (pigstyId != null) {
+                String pastureName = baseMapper.selectPastureNameByPigstyId(pigstyId);
+                if (StringUtils.isNotEmpty(pastureName)) {
+                    pigBaseVo.setPasture(pastureName);
+                }
             }
 
-            if (ObjectUtil.isNotNull(pigstyEntity)) {
-                String number = pigstyEntity.getNumber();
-                if (StringUtils.isNotEmpty(number)) {
-                    pigBaseVo.setPigsty(number);
+            LambdaQueryWrapper<AnimalHeatEntity> animalHeatLambdaQuery = Wrappers.lambdaQuery();
+            animalHeatLambdaQuery.eq(AnimalHeatEntity::getEartag, pigEarTagNo).orderByDesc(AnimalHeatEntity::getCollectTime);
+            animalHeatLambdaQuery.last("limit 1");
+            AnimalHeatEntity animalHeatEntity = animalHeatDao.selectOne(animalHeatLambdaQuery);
+            if (ObjectUtil.isNotNull(animalHeatEntity)) {
+                Double temperature = animalHeatEntity.getTemperature();
+                if (temperature != null) {
+                    pigBaseVo.setBodyTemperature(temperature);
                 }
             }
-            //虚拟数据 待填充
-            pigBaseVo.setBodyTemperature("100");
+
         }
         return pigBaseVo;
     }
@@ -126,7 +137,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
                     }
                 }
                 //虚拟数据 待填充
-                pigBaseVo.setBodyTemperature("100");
+                pigBaseVo.setBodyTemperature(100D);
                 pigBaseVoList.add(pigBaseVo);
             }
         }
@@ -208,7 +219,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
         LambdaQueryWrapper<SportTimeEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
 
         //虚假数据
-        lambdaQueryWrapper.eq(SportTimeEntity::getEartag,pigEarTagNo);
+        lambdaQueryWrapper.eq(SportTimeEntity::getEartag, pigEarTagNo);
         SportTimeEntity sportTimeEntity = sportTimeDao.selectOne(lambdaQueryWrapper);
         sportVo.setActivityAmount(sportTimeEntity.getSportCount());
         sportVo.setPigEartagNo(pigEarTagNo);
@@ -220,7 +231,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
 
         //虚假数据
         LambdaQueryWrapper<SleepStatusEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(SleepStatusEntity::getEartag,pigEarTagNo);
+        lambdaQueryWrapper.eq(SleepStatusEntity::getEartag, pigEarTagNo);
         SleepStatusEntity sleepStatusEntity = sleepStatusDao.selectOne(lambdaQueryWrapper);
 
 

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

@@ -25,10 +25,8 @@
 
 
     <select id="selectFeederInfoByPigEarTagNo" parameterType="string" resultType="com.huimv.apiservice.entity.EmployeeEntity">
-        SELECT
-          me.*
-        FROM
-          mgt_employee me
+        SELECT me.*
+        FROM mgt_employee me
         JOIN mgt_pigsty mp
         ON me.id = mp.feeder_id
         JOIN mgt_pigsty_pig mpp
@@ -37,4 +35,13 @@
     </select>
 
 
+    <select id="selectPastureNameByPigstyId" resultType="java.lang.String">
+        SELECT mc.name
+        FROM mgt_pigsty zs
+        JOIN mgt_pasture mc
+        ON zs.pasture_id = mc.id
+        WHERE zs.id = #{pigstyId}
+    </select>
+
+
 </mapper>