修改数据库表结构，添加两个接口

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/MathTestMain.java

@@ -0,0 +1,27 @@
+package com.huimv.apiservice;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.apiservice
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/5/11 0011 10:00
+ **/
+public class MathTestMain {
+
+    public static void main(String[] args) {
+
+        System.out.println(1000000000 * 3);
+
+//        int i = Math.multiplyExact(1000000000, 3);
+//        System.out.println(i);
+
+        float f = 123456789;
+        System.out.println(f);
+
+        long round = Math.round(123.49);
+        System.out.println(round);
+
+        System.out.println(String.format("%.2f", 123.5549));
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.huimv.apiservice.controller;
 
+import com.huimv.apiservice.entity.SleepStatusEntity;
 import com.huimv.apiservice.entity.vo.*;
 import com.huimv.apiservice.service.PigService;
 import com.huimv.common.utils.R;
@@ -77,10 +78,32 @@ public class PigController {
     public R getFeedTimes(@RequestParam(value = "accessToken", required = false) String accessToken,
                           @RequestParam("pigEarTagNo") String pigEarTagNo) {
         //TODO token校验
+
           = pigService.getFeedTimes(pigEarTagNo);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", envVo);
     }
 
+    //8.获取当天的睡眠状态数据接⼝
+    @RequestMapping("/getSleepStatus")
+    public R getSleepStatus(@RequestParam(value = "accessToken", required = false) String accessToken,
+                               @RequestParam("pigEarTagNo") String pigEarTagNo) {
+        //TODO token校验
+        SleepStatusEntity sleepStatusEntity = pigService.getSleepStatus(pigEarTagNo);
+
+
+
+        return Objects.requireNonNull(Objects.requireNonNull(R.ok().put("code", 1000)).put("msg", "查询成功")).put("data",sleepStatusEntity );
+    }
 
+    //9.获取当天的运动数据接⼝
+    @RequestMapping("/getActivityAmount")
+    public R getActivityAmount(@RequestParam(value = "accessToken", required = false) String accessToken,
+                       @RequestParam("pigEarTagNo") String pigEarTagNo) {
+        //TODO token校验
+        PigSportVo pigSportVo = pigService.getActivityAmount(pigEarTagNo);
+
+
+        return Objects.requireNonNull(Objects.requireNonNull(R.ok().put("code", 1000)).put("msg", "查询成功")).put("data",pigSportVo );
+    }
 
 }

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.AnimalHeatEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 体温信息表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface AnimalHeatDao extends BaseMapper<AnimalHeatEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.EatTimeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 采食频次表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface EatTimeDao extends BaseMapper<EatTimeEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.IndoorEnvironmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 室内环境信息表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface IndoorEnvironmentDao extends BaseMapper<IndoorEnvironmentEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.OutdoorEnvironmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 室外环境信息表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface OutdoorEnvironmentDao extends BaseMapper<OutdoorEnvironmentEntity> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.PastureEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 牧场表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface PastureDao extends BaseMapper<PastureEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.PeriodEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 栏期信息表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface PeriodDao extends BaseMapper<PeriodEntity> {
+	
+}

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

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

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

@@ -0,0 +1,19 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.SleepStatusEntity;
+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 SleepStatusDao extends BaseMapper<SleepStatusEntity> {
+	
+}

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

@@ -0,0 +1,19 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.SportTimeEntity;
+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 SportTimeDao extends BaseMapper<SportTimeEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.TestEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-04-28 19:33:24
+ */
+@Mapper
+public interface TestDao extends BaseMapper<TestEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.UnitEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 单元信息表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface UnitDao extends BaseMapper<UnitEntity> {
+	
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.apiservice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.apiservice.entity.WaterTargetEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 饮用水指标
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-05-07 15:32:42
+ */
+@Mapper
+public interface WaterTargetDao extends BaseMapper<WaterTargetEntity> {
+	
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_animal_heat")
+public class AnimalHeatEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
+     * 体温数值
+     */
+    private Double temperature;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date nowDate;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+
+    /**
+     * 删除状态 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/EatTimeEntity.java

@@ -0,0 +1,65 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_eat_time")
+public class EatTimeEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date nowDate;
+    /**
+     * 采食量
+     */
+    private Integer eatCount;
+    /**
+     * 体重
+     */
+    private Double weight;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+
+    /**
+     * 删除状态 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/EmployeeEntity.java

@@ -42,7 +42,7 @@ public class EmployeeEntity implements Serializable {
     /**
      * 是否当前在职（1：在岗，0不在岗）
      */
-    private Boolean jobStauts;
+    private Boolean jobStatus;
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -0,0 +1,68 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_indoor_environment")
+public class IndoorEnvironmentEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 豬舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 温度
+     */
+    private Double temperature;
+    /**
+     * 湿度
+     */
+    private Double humidity;
+    /**
+     * 气体
+     */
+    private String gas;
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date date;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+    /**
+     * 删除状态 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/OutdoorEnvironmentEntity.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_outdoor_environment")
+public class OutdoorEnvironmentEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 日期
+     */
+    private Date date;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+    /**
+     * 删除状态 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/PastureEntity.java

@@ -0,0 +1,61 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_pasture")
+public class PastureEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 牧场id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 牧场名称
+	 */
+	private String name;
+	/**
+	 * 牧场地址
+	 */
+	private String location;
+	/**
+	 * 负责人
+	 */
+	private String manager;
+	/**
+	 * 牧场建立日期
+	 */
+//	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date buildTime;
+	/**
+	 * 删除状态 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/PeriodEntity.java

@@ -0,0 +1,52 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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_period")
+public class PeriodEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 栏期id
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 栏期编号
+     */
+    private String number;
+    /**
+     * 猪舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 牧场id
+     */
+    private Integer pastureId;
+    /**
+     * 删除状态 0.正常 1.已删除
+     */
+    private Boolean deleted;
+    /**
+     * 创建时间
+     */
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    private Date gmtModified;
+
+}

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

@@ -34,7 +34,7 @@ public class PigstyEntity implements Serializable {
     /**
      * 养殖员名称
      */
-    private String feeder;
+    private String feederId;
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -0,0 +1,66 @@
+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_pig")
+public class PigstyPigEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 猪舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 栏位
+     */
+    private String field;
+    /**
+     * 栏期
+     */
+    private Integer period;
+    /**
+     * 猪耳标号
+     */
+    private String eartag;
+    /**
+     * 入栏时间
+     */
+    private Date intoFenceTime;
+    /**
+     * 离栏时间
+     */
+    private Date outFenceTime;
+    /**
+     * 删除状态 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/SleepStatusEntity.java

@@ -0,0 +1,64 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_sleep_status")
+public class SleepStatusEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date nowDate;
+    /**
+     * 入睡时间
+     */
+    private Date sleepTime;
+    /**
+     * 睡眠时长
+     */
+    private String sleepCount;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+    /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
+     * 删除状态 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/SportTimeEntity.java

@@ -0,0 +1,60 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_sport_time")
+public class SportTimeEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date nowDate;
+    /**
+     * 运动量
+     */
+    private String sportCount;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+    /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
+     * 删除状态 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

@@ -0,0 +1,33 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-04-28 19:33:24
+ */
+@Data
+@TableName("mgt_test")
+public class TestEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private String name;
+    /**
+     *
+     */
+    private String address;
+    /**
+     *
+     */
+    private Integer age;
+
+}

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

@@ -0,0 +1,55 @@
+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_unit")
+public class UnitEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单元id
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 单元编号
+     */
+    private String number;
+    /**
+     * 猪舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 牧场id
+     */
+    private Integer pastureId;
+
+	/**
+	 * 删除状态 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/WaterTargetEntity.java

@@ -0,0 +1,52 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_water_target")
+public class WaterTargetEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date date;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+    /**
+     * 删除状态 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/YearPigBaseEntity.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 年猪基本信息
+ * 年猪基本
  *
  * @author yinhao
  * @email yinhao@163.com
@@ -56,6 +56,26 @@ public class YearPigBaseEntity implements Serializable {
     * 品种
     */
     private String breed;
+
+    /**
+     * 性別
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 豬舍id
+     */
+    private Integer pigstyId;
+
+    /**
+     * 栏期id
+     */
+    private Integer periodId;
     /**
      * 删除状态 0正常 1已删除
      */

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/YearPigHistortWeightEntity.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_histort_weight")
+public class YearPigHistortWeightEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 耳标号
+     */
+    private String eartag;
+    /**
+     * 日龄
+     */
+    private Integer dayAge;
+    /**
+     * 体重
+     */
+    private Double weight;
+    /**
+     * 删除状态 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/PigSportVo.java

@@ -0,0 +1,27 @@
+package com.huimv.apiservice.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.apiservice.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/5/10 0010 15:59
+ **/
+@Data
+public class PigSportVo {
+
+   /*
+   * 耳标号
+   */
+    private String pigEartagNo;
+
+
+
+    /*
+     * 运动次数
+     */
+    private String activityAmount;
+
+}

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

@@ -1,8 +1,13 @@
 package com.huimv.apiservice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.apiservice.entity.SleepStatusEntity;
 import com.huimv.apiservice.entity.YearPigBaseEntity;
 import com.huimv.apiservice.entity.vo.*;
+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.entity.vo.PigSportVo;
 
 import java.util.List;
 
@@ -25,4 +30,8 @@ public interface PigService extends IService<YearPigBaseEntity> {
     PigKeeperVo getKeeper(String pigEarTagNo);
 
     EnvVo getIndoorEnv(String pigEarTagNo);
+
+    PigSportVo getActivityAmount(String pigEarTagNo);
+
+    SleepStatusEntity getSleepStatus(String pigEarTagNo);
 }

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

@@ -1,7 +1,9 @@
 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.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +15,8 @@ import com.huimv.apiservice.entity.EmployeeEntity;
 import com.huimv.apiservice.entity.PigstyEntity;
 import com.huimv.apiservice.entity.YearPigBaseEntity;
 import com.huimv.apiservice.entity.YearPigPedigreeEntity;
+import com.huimv.apiservice.dao.*;
+import com.huimv.apiservice.entity.*;
 import com.huimv.apiservice.entity.vo.*;
 import com.huimv.apiservice.service.PigService;
 import org.apache.commons.lang3.StringUtils;
@@ -40,6 +44,11 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
     @Autowired
     private YearPigPedigreeDao yearPigPedigreeDao;
 
+    @Autowired
+    private SleepStatusDao sleepStatusDao;
+
+    @Autowired
+    private SportTimeDao sportTimeDao;
 
     @Override
     public PigBaseVo getPigInfoByEarTagNo(String pigEarTagNo) {
@@ -193,6 +202,32 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
     }
 
     @Override
+    public PigSportVo getActivityAmount(String pigEarTagNo) {
+        PigSportVo sportVo = new PigSportVo();
+
+        LambdaQueryWrapper<SportTimeEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+
+        //虚假数据
+        lambdaQueryWrapper.eq(SportTimeEntity::getEartag,pigEarTagNo);
+        SportTimeEntity sportTimeEntity = sportTimeDao.selectOne(lambdaQueryWrapper);
+        sportVo.setActivityAmount(sportTimeEntity.getSportCount());
+        sportVo.setPigEartagNo(pigEarTagNo);
+        return sportVo;
+    }
+
+    @Override
+    public SleepStatusEntity getSleepStatus(String pigEarTagNo) {
+
+        //虚假数据
+        LambdaQueryWrapper<SleepStatusEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(SleepStatusEntity::getEartag,pigEarTagNo);
+        SleepStatusEntity sleepStatusEntity = sleepStatusDao.selectOne(lambdaQueryWrapper);
+
+
+        return sleepStatusEntity;
+    }
+
+    @Override
     public EnvVo getIndoorEnv(String pigEarTagNo) {
 
         return null;

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

@@ -0,0 +1,19 @@
+<?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.AnimalHeatDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.AnimalHeatEntity" id="animalHeatMap">
+        <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
+        <result property="temperature" column="temperature"/>
+        <result property="nowDate" column="now_date"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?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.EatTimeDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.EatTimeEntity" id="eatTimeMap">
+        <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
+        <result property="nowDate" column="now_date"/>
+        <result property="eatCount" column="eat_count"/>
+        <result property="weight" column="weight"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -10,13 +10,11 @@
         <result property="position" column="position"/>
         <result property="approachTime" column="approach_time"/>
         <result property="departureTime" column="departure_time"/>
-        <result property="jobStauts" column="job_stauts"/>
+        <result property="jobStatus" column="job_status"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
     </resultMap>
 
 
-
-
 </mapper>

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

@@ -0,0 +1,21 @@
+<?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.IndoorEnvironmentDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.IndoorEnvironmentEntity" id="indoorEnvironmentMap">
+        <result property="id" column="id"/>
+        <result property="pigstyId" column="pigsty_id"/>
+        <result property="temperature" column="temperature"/>
+        <result property="humidity" column="humidity"/>
+        <result property="gas" column="gas"/>
+        <result property="date" column="date"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.OutdoorEnvironmentDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.OutdoorEnvironmentEntity" id="outdoorEnvironmentMap">
+        <result property="id" column="id"/>
+        <result property="date" column="date"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.PastureDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.PastureEntity" id="pastureMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="location" column="location"/>
+        <result property="manager" column="manager"/>
+        <result property="buildTime" column="build_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/PeriodDao.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.PeriodDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.PeriodEntity" id="periodMap">
+        <result property="id" column="id"/>
+        <result property="number" column="number"/>
+        <result property="pigstyId" column="pigsty_id"/>
+        <result property="pastureId" column="pasture_id"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/PigstyDao.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.PigstyDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.PigstyEntity" id="pigstyMap">
+        <result property="id" column="id"/>
+        <result property="number" column="number"/>
+        <result property="pastureId" column="pasture_id"/>
+        <result property="feederId" column="feeder_id"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.PigstyPigDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.PigstyPigEntity" id="pigstyPigMap">
+        <result property="id" column="id"/>
+        <result property="pigstyId" column="pigsty_id"/>
+        <result property="field" column="field"/>
+        <result property="period" column="period"/>
+        <result property="eartag" column="eartag"/>
+        <result property="intoFenceTime" column="into_fence_time"/>
+        <result property="outFenceTime" column="out_fence_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?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.SleepStatusDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.SleepStatusEntity" id="sleepStatusMap">
+        <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
+        <result property="nowDate" column="now_date"/>
+        <result property="sleepTime" column="sleep_time"/>
+        <result property="sleepCount" column="sleep_count"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.SportTimeDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.SportTimeEntity" id="sportTimeMap">
+        <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
+        <result property="nowDate" column="now_date"/>
+        <result property="sportCount" column="sport_count"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,14 @@
+<?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.TestDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.TestEntity" id="testMap">
+        <result property="name" column="name"/>
+        <result property="address" column="address"/>
+        <result property="age" column="age"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/UnitDao.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.UnitDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.UnitEntity" id="unitMap">
+        <result property="id" column="id"/>
+        <result property="number" column="number"/>
+        <result property="pigstyId" column="pigsty_id"/>
+        <result property="pastureId" column="pasture_id"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.WaterTargetDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.apiservice.entity.WaterTargetEntity" id="waterTargetMap">
+        <result property="id" column="id"/>
+        <result property="date" column="date"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.huimv.apiservice.dao.PigDao">
 
-	<!-- 可根据自己的需求，是否要使用 -->
+    <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.apiservice.entity.YearPigBaseEntity" id="yearPigBaseMap">
         <result property="id" column="id"/>
         <result property="eartag" column="eartag"/>
@@ -13,6 +13,11 @@
         <result property="fosterStatus" column="foster_status"/>
         <result property="healthStatus" column="health_status"/>
         <result property="whereDidYouGo" column="where_did_you_go"/>
+        <result property="breed" column="breed"/>
+        <result property="sex" column="sex"/>
+        <result property="birthday" column="birthday"/>
+        <result property="pigstyId" column="pigsty_id"/>
+        <result property="periodId" column="period_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>

huimv-smart-management/src/main/java/com/huimv/management/controller/AnimalHeatController.java

@@ -28,7 +28,8 @@ import com.huimv.common.utils.R;
 @Api(tags = "体温信息表")
 @RestController
 @RequestMapping("management/animalheat")
-public class AnimalHeatController {
+public class
+AnimalHeatController {
     @Autowired
     private AnimalHeatService animalHeatService;
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -25,17 +26,23 @@ public class AnimalHeatEntity implements Serializable {
     @TableId
     private Integer id;
     /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
      * 体温数值
      */
     private Double temperature;
     /**
      * 当前日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date nowDate;
     /**
      * 采集时间
      */
     private Date collectTime;
+
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -25,8 +26,13 @@ public class EatTimeEntity implements Serializable {
     @TableId
     private Integer id;
     /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
      * 当前日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date nowDate;
     /**
      * 采食量
@@ -40,6 +46,7 @@ public class EatTimeEntity implements Serializable {
      * 采集时间
      */
     private Date collectTime;
+
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -25,6 +26,10 @@ public class IndoorEnvironmentEntity implements Serializable {
     @TableId
     private Integer id;
     /**
+     * 豬舍id
+     */
+    private Integer pigstyId;
+    /**
      * 温度
      */
     private Double temperature;
@@ -39,6 +44,7 @@ public class IndoorEnvironmentEntity implements Serializable {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date date;
     /**
      * 采集时间

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

@@ -35,7 +35,7 @@ public class PigstyEntity implements Serializable {
     /**
      * 养殖员名称
      */
-    private String feeder;
+    private String feederId;
     /**
      * 删除状态 0正常 1已删除
      */

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

@@ -25,7 +25,7 @@ public class PigstyPigEntity implements Serializable {
     @TableId
     private Integer id;
     /**
-     * 猪舍
+     * 猪舍id
      */
     private Integer pigsty;
     /**

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -27,6 +28,7 @@ public class SleepStatusEntity implements Serializable {
     /**
      * 当前日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date nowDate;
     /**
      * 入睡时间
@@ -41,6 +43,10 @@ public class SleepStatusEntity implements Serializable {
      */
     private Date collectTime;
     /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
      * 删除状态 0正常 1已删除
      */
     @TableLogic

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -27,6 +28,7 @@ public class SportTimeEntity implements Serializable {
     /**
      * 当前日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date nowDate;
     /**
      * 运动量
@@ -37,6 +39,10 @@ public class SportTimeEntity implements Serializable {
      */
     private Date collectTime;
     /**
+     * 耳标号
+     */
+    private String  eartag;
+    /**
      * 删除状态 0正常 1已删除
      */
     @TableLogic

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -27,6 +28,7 @@ public class WaterTargetEntity implements Serializable {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date date;
     /**
      * 采集时间

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

@@ -57,6 +57,26 @@ public class YearPigBaseEntity implements Serializable {
     * 品种
     */
     private String breed;
+
+    /**
+     * 性別
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 豬舍id
+     */
+    private Integer pigstyId;
+
+    /**
+     * 栏期id
+     */
+    private Integer periodId;
     /**
      * 删除状态 0正常 1已删除
      */

huimv-smart-management/src/main/resources/mapper/management/AnimalHeatDao.xml

@@ -6,6 +6,7 @@
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.management.entity.AnimalHeatEntity" id="animalHeatMap">
         <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
         <result property="temperature" column="temperature"/>
         <result property="nowDate" column="now_date"/>
         <result property="collectTime" column="collect_time"/>

huimv-smart-management/src/main/resources/mapper/management/EatTimeDao.xml

@@ -6,6 +6,7 @@
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.management.entity.EatTimeEntity" id="eatTimeMap">
         <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
         <result property="nowDate" column="now_date"/>
         <result property="eatCount" column="eat_count"/>
         <result property="weight" column="weight"/>

huimv-smart-management/src/main/resources/mapper/management/EmployeeDao.xml

@@ -10,7 +10,7 @@
         <result property="position" column="position"/>
         <result property="approachTime" column="approach_time"/>
         <result property="departureTime" column="departure_time"/>
-        <result property="jobStauts" column="job_stauts"/>
+        <result property="jobStatus" column="job_status"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>

huimv-smart-management/src/main/resources/mapper/management/IndoorEnvironmentDao.xml

@@ -6,6 +6,7 @@
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.management.entity.IndoorEnvironmentEntity" id="indoorEnvironmentMap">
         <result property="id" column="id"/>
+        <result property="pigstyId" column="pigsty_id"/>
         <result property="temperature" column="temperature"/>
         <result property="humidity" column="humidity"/>
         <result property="gas" column="gas"/>

huimv-smart-management/src/main/resources/mapper/management/PigstyDao.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="number" column="number"/>
         <result property="pastureId" column="pasture_id"/>
-        <result property="feeder" column="feeder"/>
+        <result property="feederId" column="feeder_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>

huimv-smart-management/src/main/resources/mapper/management/PigstyPigDao.xml

@@ -6,7 +6,7 @@
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.management.entity.PigstyPigEntity" id="pigstyPigMap">
         <result property="id" column="id"/>
-        <result property="pigsty" column="pigsty"/>
+        <result property="pigstyId" column="pigsty_id"/>
         <result property="field" column="field"/>
         <result property="period" column="period"/>
         <result property="eartag" column="eartag"/>

huimv-smart-management/src/main/resources/mapper/management/SleepStatusDao.xml

@@ -6,6 +6,7 @@
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.management.entity.SleepStatusEntity" id="sleepStatusMap">
         <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
         <result property="nowDate" column="now_date"/>
         <result property="sleepTime" column="sleep_time"/>
         <result property="sleepCount" column="sleep_count"/>

huimv-smart-management/src/main/resources/mapper/management/SportTimeDao.xml

@@ -6,6 +6,7 @@
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.management.entity.SportTimeEntity" id="sportTimeMap">
         <result property="id" column="id"/>
+        <result property="eartag" column="eartag"/>
         <result property="nowDate" column="now_date"/>
         <result property="sportCount" column="sport_count"/>
         <result property="collectTime" column="collect_time"/>

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

@@ -13,6 +13,11 @@
         <result property="fosterStatus" column="foster_status"/>
         <result property="healthStatus" column="health_status"/>
         <result property="whereDidYouGo" column="where_did_you_go"/>
+        <result property="breed" column="breed"/>
+        <result property="sex" column="sex"/>
+        <result property="birthday" column="birthday"/>
+        <result property="pigstyId" column="pigsty_id"/>
+        <result property="periodId" column="period_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>