后台管理字段注解添加

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

@@ -0,0 +1,20 @@
+package com.huimv.apiservice.controller;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.apiservice.controller
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/5/8 0008 17:13
+ **/
+@RestController
+@RequestMapping("/pig")
+@CrossOrigin
+public class pigController {
+
+
+}

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

@@ -90,3 +90,6 @@ mybatis-plus:
     jdbc-type-for-null: 'null'
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
+
+renyang:
+  client: 20210501

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

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 体温信息表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,36 +17,39 @@ import lombok.Data;
 @Data
 @TableName("mgt_animal_heat")
 public class AnimalHeatEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 体温数值
-	 */
-	private Double temperature;
-	/**
-	 * 当前日期
-	 */
-	private Date nowDate;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 体温数值
+     */
+    private Double temperature;
+    /**
+     * 当前日期
+     */
+    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-management/src/main/java/com/huimv/management/entity/EatTimeEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 采食频次表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,40 +17,43 @@ import lombok.Data;
 @Data
 @TableName("mgt_eat_time")
 public class EatTimeEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 当前日期
-	 */
-	private Date nowDate;
-	/**
-	 * 采食量
-	 */
-	private Integer eatCount;
-	/**
-	 * 体重
-	 */
-	private Double weight;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 当前日期
+     */
+    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-management/src/main/java/com/huimv/management/entity/EmployeeEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 养殖员信息表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,44 +17,47 @@ import lombok.Data;
 @Data
 @TableName("mgt_employee")
 public class EmployeeEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 姓名
-	 */
-	private String name;
-	/**
-	 * 职位
-	 */
-	private String position;
-	/**
-	 * 入场时间
-	 */
-	private Date approachTime;
-	/**
-	 * 离场时间
-	 */
-	private Date departureTime;
-	/**
-	 * 是否当前在职（1：在岗，0不在岗）
-	 */
-	private Boolean jobStauts;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 职位
+     */
+    private String position;
+    /**
+     * 入场时间
+     */
+    private Date approachTime;
+    /**
+     * 离场时间
+     */
+    private Date departureTime;
+    /**
+     * 是否当前在职（1：在岗，0不在岗）
+     */
+    private Boolean jobStauts;
+    /**
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date gmtModified;
 
 }

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

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 室内环境信息表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,44 +17,47 @@ import lombok.Data;
 @Data
 @TableName("mgt_indoor_environment")
 public class IndoorEnvironmentEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 温度
-	 */
-	private Double temperature;
-	/**
-	 * 湿度
-	 */
-	private Double humidity;
-	/**
-	 * 气体
-	 */
-	private String gas;
-	/**
-	 * 日期
-	 */
-	private Date date;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 温度
+     */
+    private Double temperature;
+    /**
+     * 湿度
+     */
+    private Double humidity;
+    /**
+     * 气体
+     */
+    private String gas;
+    /**
+     * 日期
+     */
+    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-management/src/main/java/com/huimv/management/entity/OutdoorEnvironmentEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 室外环境信息表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,32 +17,35 @@ import lombok.Data;
 @Data
 @TableName("mgt_outdoor_environment")
 public class OutdoorEnvironmentEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 日期
-	 */
-	private Date date;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @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-management/src/main/java/com/huimv/management/entity/PastureEntity.java

@@ -1,6 +1,5 @@
 package com.huimv.management.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
@@ -8,7 +7,6 @@ import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 牧场表

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

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 栏期信息表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,36 +17,36 @@ import lombok.Data;
 @Data
 @TableName("mgt_period")
 public class PeriodEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    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;
+    /**
+     * 栏期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-management/src/main/java/com/huimv/management/entity/PigstyEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 猪舍表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,36 +17,39 @@ import lombok.Data;
 @Data
 @TableName("mgt_pigsty")
 public class PigstyEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 猪舍id
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 猪舍编号
-	 */
-	private String number;
-	/**
-	 * 牧场id
-	 */
-	private Integer pastureId;
-	/**
-	 * 养殖员名称
-	 */
-	private String feeder;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     * 猪舍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-management/src/main/java/com/huimv/management/entity/PigstyPigEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 猪舍和猪关联表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,48 +17,51 @@ import lombok.Data;
 @Data
 @TableName("mgt_pigsty_pig")
 public class PigstyPigEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 猪舍
-	 */
-	private Integer pigsty;
-	/**
-	 * 栏位
-	 */
-	private String field;
-	/**
-	 * 栏期
-	 */
-	private Integer period;
-	/**
-	 * 猪耳标号
-	 */
-	private String eartag;
-	/**
-	 * 入栏时间
-	 */
-	private Date intoFenceTime;
-	/**
-	 * 离栏时间
-	 */
-	private Date outFenceTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 猪舍
+     */
+    private Integer pigsty;
+    /**
+     * 栏位
+     */
+    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-management/src/main/java/com/huimv/management/entity/SleepStatusEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 睡眠状态表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,40 +17,43 @@ import lombok.Data;
 @Data
 @TableName("mgt_sleep_status")
 public class SleepStatusEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 当前日期
-	 */
-	private Date nowDate;
-	/**
-	 * 入睡时间
-	 */
-	private Date sleepTime;
-	/**
-	 * 睡眠时长
-	 */
-	private String sleepCount;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 当前日期
+     */
+    private Date nowDate;
+    /**
+     * 入睡时间
+     */
+    private Date sleepTime;
+    /**
+     * 睡眠时长
+     */
+    private String sleepCount;
+    /**
+     * 采集时间
+     */
+    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-management/src/main/java/com/huimv/management/entity/SportTimeEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 运动频次表
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,36 +17,39 @@ import lombok.Data;
 @Data
 @TableName("mgt_sport_time")
 public class SportTimeEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 当前日期
-	 */
-	private Date nowDate;
-	/**
-	 * 运动量
-	 */
-	private String sportCount;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 当前日期
+     */
+    private Date nowDate;
+    /**
+     * 运动量
+     */
+    private String sportCount;
+    /**
+     * 采集时间
+     */
+    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-management/src/main/java/com/huimv/management/entity/TestEntity.java

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

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

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

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

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 饮用水指标
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,32 +17,35 @@ import lombok.Data;
 @Data
 @TableName("mgt_water_target")
 public class WaterTargetEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 日期
-	 */
-	private Date date;
-	/**
-	 * 采集时间
-	 */
-	private Date collectTime;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @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-management/src/main/java/com/huimv/management/entity/YearPigBaseEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 年猪基本
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,52 +17,60 @@ import lombok.Data;
 @Data
 @TableName("mgt_year_pig_base")
 public class YearPigBaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 耳标号
+     */
+    private String eartag;
+    /**
+     * 日龄
+     */
+    private Integer dayAge;
+    /**
+     * 单元
+     */
+    private Integer unitId;
+    /**
+     * 体重
+     */
+    private Double weight;
+    /**
+     * 是否认养
+     */
+    private Boolean fosterStatus;
+    /**
+     * 是否健康
+     */
+    private Boolean healthStatus;
+    /**
+     * 去向信息
+     */
+    private String whereDidYouGo;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 耳标号
-	 */
-	private String eartag;
-	/**
-	 * 日龄
-	 */
-	private Integer dayAge;
-	/**
-	 * 单元
-	 */
-	private Integer unitId;
-	/**
-	 * 体重
-	 */
-	private Double weight;
-	/**
-	 * 是否认养
-	 */
-	private Boolean fosterStatus;
-	/**
-	 * 是否健康
-	 */
-	private Boolean healthStatus;
-	/**
-	 * 去向信息
-	 */
-	private String whereDidYouGo;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+    * 品种
+    */
+    private String variety;
+    /**
+     * 删除状态 0正常 1已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date gmtCreate;
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date gmtModified;
 
 }

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

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 年猪历史体重
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,36 +17,39 @@ import lombok.Data;
 @Data
 @TableName("mgt_year_pig_histort_weight")
 public class YearPigHistortWeightEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 耳标号
-	 */
-	private String eartag;
-	/**
-	 * 日龄
-	 */
-	private Integer dayAge;
-	/**
-	 * 体重
-	 */
-	private Double weight;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @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-management/src/main/java/com/huimv/management/entity/YearPigHistoryImgEntity.java

@@ -1,15 +1,15 @@
 package com.huimv.management.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 年猪历史照片
- * 
+ *
  * @author yinhao
  * @email yinhao@163.com
  * @date 2021-05-07 15:32:42
@@ -17,32 +17,35 @@ import lombok.Data;
 @Data
 @TableName("mgt_year_pig_history_img")
 public class YearPigHistoryImgEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 耳标号
-	 */
-	private String eartag;
-	/**
-	 * 照片
-	 */
-	private String img;
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Boolean deleted;
-	/**
-	 * 创建时间
-	 */
-	private Date gmtCreate;
-	/**
-	 * 修改时间
-	 */
-	private Date gmtModified;
+    /**
+     *
+     */
+    @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-management/src/main/java/com/huimv/management/entity/YearPigPedigreeEntity.java

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