2021/6/10 16:23 formFarmId后端处理

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

@@ -1,5 +1,7 @@
 package com.huimv.apiservice;
 
+import java.util.Random;
+
 /**
  * main for test
  *
@@ -9,19 +11,26 @@ public class MathTestMain {
 
     public static void main(String[] args) {
 
-        System.out.println(System.currentTimeMillis());
-
-        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(System.currentTimeMillis());
+//
+//        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));
+
+        Random random = new Random();
+        for (int i = 0; i < 20; i++) {
+            int num = 144 +  random.nextInt(5);
+            System.out.println(num);
+        }
 
-        System.out.println(String.format("%.2f", 123.5549));
     }
 }

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

@@ -1,7 +1,7 @@
 package com.huimv.apiservice.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.apiservice.entity.PastureEntity;
+import com.huimv.apiservice.entity.FarmEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-05-07 15:32:42
  */
 @Mapper
-public interface PastureDao extends BaseMapper<PastureEntity> {
+public interface FarmDao extends BaseMapper<FarmEntity> {
 	
 }

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

@@ -1,9 +1,12 @@
 package com.huimv.apiservice.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.apiservice.entity.IndoorEnvironmentEntity;
+import com.huimv.apiservice.entity.vo.IndoorEnvVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.mapping.StatementType;
 import org.springframework.stereotype.Repository;
@@ -27,4 +30,5 @@ public interface IndoorEnvironmentDao extends BaseMapper<IndoorEnvironmentEntity
     @Options(statementType = StatementType.CALLABLE)
     void callPigHealthData();
 
+    List<IndoorEnvVo> select(@Param("ew") LambdaQueryWrapper indoorEnvLambdaQuery);
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.apiservice.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.apiservice.entity.OutdoorEnvironmentEntity;
+import com.huimv.apiservice.entity.vo.OutdoorEnvVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -19,4 +22,6 @@ import java.util.List;
 public interface OutdoorEnvironmentDao extends BaseMapper<OutdoorEnvironmentEntity> {
 
     void batchInsertData(List<OutdoorEnvironmentEntity> list);
+
+    List<OutdoorEnvVo> select(@Param("ew") LambdaQueryWrapper outdoorEnvLambdaQuery);
 }

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

@@ -1,24 +0,0 @@
-package com.huimv.apiservice.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.apiservice.entity.SowChildbirthEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author yinhao
- * @date 2021/5/26 13:39
- */
-@Mapper
-@Repository
-public interface SowChildbirthDao extends BaseMapper<SowChildbirthEntity> {
-
-    void batchInsertData(List<SowChildbirthEntity> list);
-
-}

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

@@ -20,7 +20,7 @@ public class AnimalHeatEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * id
+     *
      */
     @TableId
     private Integer id;

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

@@ -0,0 +1,39 @@
+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-06-15 09:44:56
+ */
+@Data
+@TableName("base_bloodline")
+public class BaseBloodlineEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 品种名称
+	 */
+	private String name;
+	/**
+	 * 原产地
+	 */
+	private String origin;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

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

@@ -0,0 +1,59 @@
+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-06-15 17:09:40
+ */
+@Data
+@TableName("base_feed_formula")
+public class BaseFeedFormulaEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 饲料名称
+	 */
+	private String ingredients;
+	/**
+	 * 配方饲料的详细信息
+	 */
+	private String details;
+	/**
+	 * 原本用来区分是基础物料还是配方饲料，暂时闲置
+	 */
+	private Integer kind;
+	/**
+	 * 原本用来区分配方饲料是否处于废弃状态，暂时闲置
+	 */
+	private Integer status;
+	/**
+	 * 阶段，这个饲料应该在哪个阶段使用
+	 */
+	private String stage;
+	/**
+	 * 对应得牧场ID，这个数据属于这个牧场
+	 */
+	private Integer farmId;
+	/**
+	 * 备注
+	 */
+	private String remark;
+	/**
+	 * 备用字段
+	 */
+	private String remark1;
+
+}

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

@@ -0,0 +1,48 @@
+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-06-15 09:49:14
+ */
+@Data
+@TableName("breed_feed_weighe")
+public class BreedFeedWeigheEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String eartagNo;
+	/**
+	 * 
+	 */
+	private Date date;
+	/**
+	 * 
+	 */
+	private Float feedIntake;
+	/**
+	 * 
+	 */
+	private Float weight;
+	/**
+	 * 
+	 */
+	private Float weightIncrease;
+
+}

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

@@ -0,0 +1,69 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 饮用水检测实体类
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/11 10:34
+ */
+@Data
+public class DrinkingWaterEntity implements Serializable {
+    private static final long serialVersionUID = 7480204097308252507L;
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
+     * 猪舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date date;
+    /**
+     * 饮用水质量
+     */
+    private String drinkingWaterQuality;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+    /**
+     * 异常状态 0:正常 1.异常
+     */
+    private Boolean abnormalStatus;
+    /**
+     * 删除状态 0:未删除 其他:已删除
+     */
+    @TableLogic
+    private Integer 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

@@ -15,8 +15,8 @@ import java.util.Date;
  * @date 2021-05-07 15:32:42
  */
 @Data
-@TableName("mgt_pasture")
-public class PastureEntity implements Serializable {
+@TableName("mgt_farm")
+public class FarmEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -33,6 +33,10 @@ public class PastureEntity implements Serializable {
 	 */
 	private String location;
 	/**
+	 * 牧场地址(front)
+	 */
+	private String frontLocation;
+	/**
 	 * 负责人
 	 */
 	private String manager;
@@ -43,10 +47,11 @@ public class PastureEntity implements Serializable {
 	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date buildTime;
 	/**
-     * 删除状态 0正常 1已删除
-     */
-    @TableLogic
-    private Integer deleted;
+	 * 删除状态 0正常 1已删除
+	 */
+	@TableLogic
+//	@TableField(fill = FieldFill.INSERT)
+	private Integer deleted;
 	/**
 	 * 创建时间
 	 */

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

@@ -0,0 +1,43 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06-10 09:44:06
+ */
+@Data
+@TableName("health_disease_cause")
+public class HealthDiseaseCauseEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 病因名称
+	 */
+	private String causeName;
+	/**
+	 * 具体描述
+	 */
+	private String description;
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+}

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

@@ -0,0 +1,55 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06-10 09:44:06
+ */
+@Data
+@TableName("health_disease")
+public class HealthDiseaseEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 疾病编号
+	 */
+	private String idseaseCode;
+	/**
+	 * 所属病种
+	 */
+	private String idseaseType;
+	/**
+	 * 疾病名称
+	 */
+	private String idseaseName;
+	/**
+	 * 猪病概述
+	 */
+	private String description;
+	/**
+	 * 临床症状
+	 */
+	private String clinlcalSymptom;
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+}

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

@@ -0,0 +1,57 @@
+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-06-10 09:44:06
+ */
+@Data
+@TableName("health_immune_record")
+public class HealthImmuneRecordEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 疫苗名称
+	 */
+	private String vaccineName;
+	/**
+	 * 小猪编号
+	 */
+	private String pigId;
+	/**
+	 * 牧场id
+	 */
+	private Integer farmId;
+	/**
+	 * 操作人姓名
+	 */
+	private String manName;
+	/**
+	 * 操作人编号
+	 */
+	private Integer manId;
+	/**
+	 * 数据有效性
+	 */
+	@TableLogic(delval = "0",value = "1")
+	private Integer effective;
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+}

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

@@ -0,0 +1,73 @@
+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-06-10 09:44:06
+ */
+@Data
+@TableName("health_isolation_record")
+public class HealthIsolationRecordEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 疾病名称
+	 */
+	private String diseaseName;
+	/**
+	 * 小猪编号
+	 */
+	private String pigCode;
+	/**
+	 * 病历号
+	 */
+	private Integer medicalRecordId;
+	/**
+	 * 入栏时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date entryTime;
+	/**
+	 * 离栏时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date offTime;
+	/**
+	 * 牧场id
+	 */
+	private Integer farmId;
+	/**
+	 * 数据有效性
+	 */
+	@TableLogic(delval = "0",value = "1")
+	private Integer effective;
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date createTime;
+	/**
+	 * 操作人姓名
+	 */
+	private String manName;
+	/**
+	 * 操作人编号
+	 */
+	private Integer manId;
+
+}

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

@@ -0,0 +1,96 @@
+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-06-10 09:44:06
+ */
+@Data
+@TableName("health_medical_record")
+public class HealthMedicalRecordEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 内部编号
+	 */
+	private String pigId;
+	/**
+	 * 疾病名称
+	 */
+	private String diseaseName;
+	/**
+	 * 症状
+	 */
+	private String symptomName;
+	/**
+	 * 病因
+	 */
+	private String causeName;
+	/**
+	 * 发病时间
+	 */
+	private Date diseaseTime;
+	/**
+	 * 兽医姓名
+	 */
+	private String doctor;
+	/**
+	 * 兽医id
+	 */
+	private Integer doctorId;
+	/**
+	 * 诊断时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date diagnosisTime;
+	/**
+	 * 治疗方案
+	 */
+	private String treatmentPlan;
+	/**
+	 * 治疗结果
+  1:康复 2：死亡，无害化处理
+	 */
+	private Integer result;
+	/**
+	 * 所属牧场
+	 */
+	private Integer farmId;
+	/**
+	 * 数据有效性
+   1：有效（默认） 0：无效
+	 */
+	@TableLogic(delval = "0",value = "1")
+	private Integer effective;
+	/**
+	 * 隔离状态
+   1：未隔离 2：隔离
+	 */
+	private Integer isolationStatus;
+	/**
+	 * 出栏时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date offTime;
+	/**
+	 * 创建时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+}

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

@@ -0,0 +1,53 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-06-10 10:07:03
+ */
+@Data
+@TableName("health_symptom")
+public class HealthSymptomEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 症状编号
+	 */
+	private String sympotomCode;
+	/**
+	 * 症状分类
+	 */
+	private String sympotomType;
+	/**
+	 * 症状名称
+	 */
+	private String sympotomName;
+	/**
+	 * 具体描述
+	 */
+	private String description;
+	/**
+	 * 创建时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+}

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

@@ -0,0 +1,53 @@
+package com.huimv.apiservice.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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-06-10 09:44:06
+ */
+@Data
+@TableName("health_treatment_plan")
+public class HealthTreatmentPlanEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 对应疾病
+	 */
+	private String diseaseCode;
+	/**
+	 * 药物名称
+	 */
+	private String medicantName;
+	/**
+	 * 药品用法
+	 */
+	private String medicantUsage;
+	/**
+	 * 描述
+	 */
+	private String description;
+	/**
+	 * 创建时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+}

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

@@ -24,6 +24,11 @@ public class IndoorEnvironmentEntity implements Serializable {
      */
     @TableId
     private Integer id;
+
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
     /**
      * 豬舍id
      */
@@ -44,13 +49,18 @@ public class IndoorEnvironmentEntity implements Serializable {
     /**
      * 气体
      */
-    private String gas;
+    private String airQuality;
     /**
      * 采集时间
      */
     private Date collectTime;
+
+    /**
+     * 异常状态 0.正常 1.异常
+     */
+    private Boolean abnormalStatus;
     /**
-     * 删除状态 0正常 1已删除
+     * 删除状态 0正常 其他:已删除
      */
     @TableLogic
     private Integer deleted;

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

@@ -25,6 +25,10 @@ public class OutdoorEnvironmentEntity implements Serializable {
     @TableId
     private Integer id;
     /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
      * 日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@@ -40,12 +44,16 @@ public class OutdoorEnvironmentEntity implements Serializable {
     /**
      * 气体
      */
-    private String gas;
+    private String airQuality;
     /**
      * 采集时间
      */
     private Date collectTime;
     /**
+     * 异常状态
+     */
+    private Boolean abnormalStatus;
+    /**
      * 删除状态 0正常 1已删除
      */
     @TableLogic

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

@@ -1,7 +1,6 @@
 package com.huimv.apiservice.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -39,14 +38,17 @@ public class PeriodEntity implements Serializable {
     /**
      * 删除状态 0.正常 1.已删除
      */
-    private Integer deleted;
+    @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/PigstyEntity.java

@@ -30,7 +30,7 @@ public class PigstyEntity implements Serializable {
     /**
      * 牧场id
      */
-    private Integer pastureId;
+    private Integer farmId;
     /**
      * 养殖员名称
      */

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

@@ -0,0 +1,46 @@
+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-06-01 13:46:33
+ */
+@Data
+@TableName("mgt_sensitive_word")
+public class SensitiveWordEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 敏感词汇
+	 */
+	private String word;
+	/**
+	 * 删除状态 0:正常 其他:已删除
+	 */
+	@TableLogic
+	private Integer 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/SowChildbirthEntity.java

@@ -1,62 +0,0 @@
-package com.huimv.apiservice.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author yinhao
- * @date 2021/5/26 13:24
- */
-@Data
-@TableName("mgt_sow_childbirth")
-public class SowChildbirthEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId
-    private Integer id;
-
-    /**
-     * 耳标号
-     */
-    private String eartag;
-
-    /**
-     * 产子时体重
-     */
-    private Double childbirthWeight;
-
-    /**
-     * 怀孕日期
-     */
-    private Date pregnancyDate;
-
-    /**
-     * 产子个数
-     */
-    private Integer childbirthCount;
-
-    @TableLogic
-    private Integer 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/ThresholdManagementEntity.java

@@ -0,0 +1,62 @@
+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-06-15 13:01:37
+ */
+@Data
+@TableName("mgt_threshold_management")
+public class ThresholdManagementEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 牧场id
+	 */
+	private Integer farmId;
+	/**
+	 * 阈值类型
+	 */
+	private Integer thresholdType;
+	/**
+	 * 所属范围
+	 * 1.室内
+	 * 2.室外
+	 * 3.体温
+	 * 4.饮用水
+	 */
+	private Short belongTo;
+	/**
+	 * 阈值数值
+	 */
+	private Double thresholdValue;
+	/**
+	 * 删除状态 0:未删除 其他:已删除
+	 */
+	@TableLogic
+	private Integer 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/UnitEntity.java

@@ -34,7 +34,7 @@ public class UnitEntity implements Serializable {
     /**
      * 牧场id
      */
-    private Integer pastureId;
+    private Integer farmId;
 
 	/**
      * 删除状态 0正常 1已删除

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

@@ -0,0 +1,90 @@
+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;
+
+/**
+ * <p>
+ * 报警信息entity
+ * </p>
+ * @author yinhao
+ * @version 1.0
+ * @date 2021-06-15 13:01:37
+ */
+@Data
+@TableName("mgt_warning_info")
+public class WarningInfoEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 当前日期
+	 */
+	private Date nowDate;
+	/**
+	 * 牧场id
+	 */
+	private Integer farmId;
+	/**
+	 * 猪舍id
+	 */
+	private Integer pigstyId;
+	/**
+	 * 耳标号
+	 */
+	private Integer earTag;
+	/**
+	 * 报警类型 
+		--室内环境
+		1:室内高温
+		2:室内低温
+		3:室内空气污染
+		4:室内饮用水污染
+
+		--室外环境
+		5.室外高温
+		6.室外低温
+		7.室外空气污染
+
+		--体温
+		8.体温高温
+		9.体温低温
+	 */
+	private Integer warningType;
+	/**
+	 * 归属于
+	 * 1.室内
+	 * 2.室外
+	 * 3.体温
+	 */
+	private Short belongTo;
+	/**
+	 * 当前数值
+	 */
+	private Double nowValue;
+	/**
+	 * 报警时间
+	 */
+	private Date warningTime;
+	/**
+	 * 确认状态 0:未确认 1.已确认
+	 */
+	private Boolean verifyStatus;
+	/**
+	 * 确认人id
+	 */
+	private Integer verifyUserId;
+	/**
+	 * 确认描述
+	 */
+	private String verifyDescription;
+
+}

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/dto/WarningInfoDto.java

@@ -0,0 +1,33 @@
+package com.huimv.apiservice.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/15 17:22
+ */
+@Data
+public class WarningInfoDto implements Serializable {
+    private static final long serialVersionUID = 2052073652827974104L;
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "id不能为空!")
+    private Integer id;
+
+    /**
+     * 确认描述
+     */
+    @NotBlank(message = "确认描述不能为空!")
+    private String verifyDescription;
+
+}

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

@@ -0,0 +1,54 @@
+package com.huimv.apiservice.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 饮用水指标vo
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/11 16:32
+ */
+@Data
+public class DrinkingWaterVo implements Serializable {
+    private static final long serialVersionUID = -2504528285198898816L;
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date date;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 豬舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 猪舍名称
+     */
+    private String pigstyName;
+    /**
+     * 饮用水质量
+     */
+    private String drinkingWaterQuality;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+}

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

@@ -0,0 +1,84 @@
+package com.huimv.apiservice.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 室内环境vo
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/11 14:31
+ */
+@Data
+public class IndoorEnvironmentVo implements Serializable {
+    private static final long serialVersionUID = -2366116041687966836L;
+
+    /**
+     * id
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date date;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 豬舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 猪舍名称
+     */
+    private String pigstyName;
+    /**
+     * 温度
+     */
+    private Double temperature;
+    /**
+     * 湿度
+     */
+    private Double humidity;
+    /**
+     * 气体
+     */
+    private String airQuality;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+
+//    /**
+//     * 异常状态 0.正常 1.异常
+//     */
+//    private Boolean abnormalStatus;
+//    /**
+//     * 删除状态 0正常 其他:已删除
+//     */
+//    @TableLogic
+//    private Integer 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/OutdoorEnvVo.java

@@ -35,5 +35,5 @@ public class OutdoorEnvVo {
     /**
      * 气体
      */
-    private String gas;
+    private String airQuality;
 }

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

@@ -0,0 +1,54 @@
+package com.huimv.apiservice.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 室外环境vo
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/11 15:54
+ */
+@Data
+public class OutdoorEnvironmentVo implements Serializable {
+    private static final long serialVersionUID = -8168339737358430651L;
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date date;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 温度
+     */
+    private Double temperature;
+    /**
+     * 湿度
+     */
+    private Double humidity;
+    /**
+     * 气体
+     */
+    private String airQuality;
+    /**
+     * 采集时间
+     */
+    private Date collectTime;
+}

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

@@ -0,0 +1,47 @@
+package com.huimv.apiservice.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 阈值管理vo
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/6/16 17:01
+ */
+@Data
+public class ThresholdManagementVo implements Serializable {
+    private static final long serialVersionUID = -1474010381756803356L;
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 阈值类型
+     */
+    private Integer thresholdType;
+    /**
+     * 所属范围
+     * 1.室内
+     * 2.室外
+     * 3.体温
+     * 4.饮用水
+     */
+    private Short belongTo;
+    /**
+     * 阈值数值
+     */
+    private Double thresholdValue;
+}

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

@@ -0,0 +1,70 @@
+package com.huimv.apiservice.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 报警信息vo
+ * </p>
+ *
+ * @author yinhao
+ * @version 1.0
+ * @date 2021/6/15 13:52
+ */
+@Data
+public class WarningInfoVo implements Serializable {
+    private static final long serialVersionUID = 4482176341970498690L;
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 当前日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date nowDate;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 猪舍id
+     */
+    private Integer pigstyId;
+    /**
+     * 猪舍名称
+     */
+    private String pigstyName;
+    /**
+     * 耳标号
+     */
+    private Integer earTag;
+    /**
+     * 报警类型(数字)
+     */
+    private Short warningType;
+    /**
+     * 归属于
+     * 1.室内
+     * 2.室外
+     * 3.体温
+     */
+    private Short belongTo;
+    /**
+     * 当前数值
+     */
+    private Double nowValue;
+    /**
+     * 报警时间
+     */
+    private Date warningTime;
+}

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

@@ -143,7 +143,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
     @Override
     public PageUtils getPageByBreedAndFence(String breedName, Integer currentPage, Integer pageSize, String period) {
 
-        Integer count = baseMapper.selectCount(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getBreed, breedName));
+        Integer count = baseMapper.selectCount(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getBreed, breedName).last("limit 1"));
         if (count <= 0) {
             throw new RRException("品种名称不存在,请检查!", 1001);
         }
@@ -178,10 +178,6 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
         EnvVo envVo = new EnvVo();
         envVo.setPigEarTagNo(pigEarTagNo);
         envVo.setDate(today);
-        List<IndoorEnvVo> indoorEnvVoList = new ArrayList<>();
-        envVo.setIndoorEnvList(indoorEnvVoList);
-        List<OutdoorEnvVo> outdoorEnvVoList = new ArrayList<>();
-        envVo.setOutdoorEnvList(outdoorEnvVoList);
 
         Integer pigstyId = yearPigBaseEntity.getPigstyId();
         if (pigstyId != null) {
@@ -189,36 +185,24 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
             indoorEnvLambdaQuery.eq(IndoorEnvironmentEntity::getPigstyId, pigstyId)
                     .eq(IndoorEnvironmentEntity::getDate, today)
                     .le(IndoorEnvironmentEntity::getCollectTime, new Date())
+                    .eq(IndoorEnvironmentEntity::getDeleted, 0)
                     .orderByDesc(IndoorEnvironmentEntity::getId);
-            List<IndoorEnvironmentEntity> indoorEnvironmentEntityList = indoorEnvironmentDao.selectList(indoorEnvLambdaQuery);
-
-            if (CollectionUtil.isNotEmpty(indoorEnvironmentEntityList)) {
-                for (IndoorEnvironmentEntity indoorEnvironmentEntity : indoorEnvironmentEntityList) {
-                    IndoorEnvVo indoorEnvVo = new IndoorEnvVo();
-                    indoorEnvVo.setCollectTime(indoorEnvironmentEntity.getCollectTime());
-                    indoorEnvVo.setTemperature(indoorEnvironmentEntity.getTemperature());
-                    indoorEnvVo.setHumidity(indoorEnvironmentEntity.getHumidity());
-                    indoorEnvVo.setGas(indoorEnvironmentEntity.getGas());
-                    indoorEnvVoList.add(indoorEnvVo);
-                }
-            }
+            List<IndoorEnvVo> indoorEnvVoList = indoorEnvironmentDao.select(indoorEnvLambdaQuery);
+            envVo.setIndoorEnvList(indoorEnvVoList);
         }
 
-        LambdaQueryWrapper<OutdoorEnvironmentEntity> outdoorEnvLambdaQuery = Wrappers.lambdaQuery();
-        outdoorEnvLambdaQuery.eq(OutdoorEnvironmentEntity::getDate, today)
-                .le(OutdoorEnvironmentEntity::getCollectTime, new Date())
-                .orderByDesc(OutdoorEnvironmentEntity::getId);
-        List<OutdoorEnvironmentEntity> outdoorEnvironmentEntityList = outdoorEnvironmentDao.selectList(outdoorEnvLambdaQuery);
-        if (CollectionUtil.isNotEmpty(outdoorEnvironmentEntityList)) {
-            for (OutdoorEnvironmentEntity outdoorEnvironmentEntity : outdoorEnvironmentEntityList) {
-                OutdoorEnvVo outdoorEnvVo = new OutdoorEnvVo();
-                outdoorEnvVo.setCollectTime(outdoorEnvironmentEntity.getCollectTime());
-                outdoorEnvVo.setTemperature(outdoorEnvironmentEntity.getTemperature());
-                outdoorEnvVo.setHumidity(outdoorEnvironmentEntity.getHumidity());
-                outdoorEnvVo.setGas(outdoorEnvironmentEntity.getGas());
-                outdoorEnvVoList.add(outdoorEnvVo);
-            }
+        Integer farmId = yearPigBaseEntity.getFarmId();
+        if (farmId != null) {
+            LambdaQueryWrapper<OutdoorEnvironmentEntity> outdoorEnvLambdaQuery = Wrappers.lambdaQuery();
+            outdoorEnvLambdaQuery.eq(OutdoorEnvironmentEntity::getFarmId, farmId)
+                    .eq(OutdoorEnvironmentEntity::getDate, today)
+                    .le(OutdoorEnvironmentEntity::getCollectTime, new Date())
+                    .eq(OutdoorEnvironmentEntity::getDeleted, 0)
+                    .orderByDesc(OutdoorEnvironmentEntity::getId);
+            List<OutdoorEnvVo> outdoorEnvVoList = outdoorEnvironmentDao.select(outdoorEnvLambdaQuery);
+            envVo.setOutdoorEnvList(outdoorEnvVoList);
         }
+
         return envVo;
     }
 
@@ -276,7 +260,11 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
      */
     private void checkPigEarTagNo(String pigEarTagNo) {
 
-        Integer count = baseMapper.selectCount(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, pigEarTagNo));
+        Integer count = baseMapper.selectCount(
+                Wrappers.<YearPigBaseEntity>lambdaQuery()
+                        .eq(YearPigBaseEntity::getEartag, pigEarTagNo)
+                        .eq(YearPigBaseEntity::getDeleted, 0)
+                        .last("limit 1"));
         if (count <= 0) {
             throw new RRException("耳标信息不存在,请检查!", 1001);
         }

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/task/CreateEverydayDataTask.java

@@ -39,7 +39,8 @@ public class CreateEverydayDataTask {
     private OutdoorEnvironmentDao outdoorEnvironmentDao;
 
     @Async
-    @Scheduled(cron = "1 0 0 * * ?")
+    //@Scheduled(cron = "1 0 0 * * ?")
+        @Scheduled(cron = "30 15 14 * * ?")
     void createTodayIndoorEnvData() {
 
         System.out.println("createTodayIndoorEnvData begin------->");
@@ -57,19 +58,24 @@ public class CreateEverydayDataTask {
         Random random = new Random();
         List<IndoorEnvironmentEntity> list = new ArrayList<>();
         for (int i = 0; i < 288; i++) {
+
             IndoorEnvironmentEntity entity = new IndoorEnvironmentEntity();
+
+            //当前日期
             entity.setDate(today);
-            entity.setPigstyId(1);
-            BigDecimal bigDecimal = new BigDecimal(Math.random() * 3 + 23).setScale(1, BigDecimal.ROUND_HALF_UP);
-            double temperature = bigDecimal.doubleValue();
-            entity.setTemperature(temperature);
-            BigDecimal bigDecimal2 = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
-            double humidity = bigDecimal2.doubleValue();
-            entity.setHumidity(humidity);
-            entity.setGas(gas.get(random.nextInt(5)));
+            //牧场id
+            entity.setFarmId(144);
+            //猪舍id
+            entity.setPigstyId(56);
+            //温度
+            entity.setTemperature(getTemperature());
+            //湿度
+            entity.setHumidity(getHumidity());
+            //空气质量
+            entity.setAirQuality(gas.get(random.nextInt(5)));
+            //采集时间
             entity.setCollectTime(collectTime);
-            collectTime = DateUtil.offsetMinute(collectTime,5);
-//            System.out.println(entity);
+            collectTime = DateUtil.offsetMinute(collectTime, 5);
             list.add(entity);
         }
 
@@ -78,8 +84,8 @@ public class CreateEverydayDataTask {
     }
 
     @Async
-    @Scheduled(cron = "1 0 0 * * ?")
-    //@Scheduled(cron = "1 52 18 * * ?")
+    //@Scheduled(cron = "1 0 0 * * ?")
+    @Scheduled(cron = "30 15 14 * * ?")
     void createTodayOutdoorEnvData() {
 
         System.out.println("createTodayOutdoorEnvData begin------->");
@@ -99,15 +105,12 @@ public class CreateEverydayDataTask {
         for (int i = 0; i < 288; i++) {
             OutdoorEnvironmentEntity entity = new OutdoorEnvironmentEntity();
             entity.setDate(today);
-            BigDecimal bigDecimal = new BigDecimal(Math.random() * 3 + 23).setScale(1, BigDecimal.ROUND_HALF_UP);
-            double temperature = bigDecimal.doubleValue();
-            entity.setTemperature(temperature);
-            BigDecimal bigDecimal2 = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
-            double humidity = bigDecimal2.doubleValue();
-            entity.setHumidity(humidity);
-            entity.setGas(gas.get(random.nextInt(4)));
+            entity.setFarmId(144);
+            entity.setTemperature(getTemperature());
+            entity.setHumidity(getHumidity());
+            entity.setAirQuality(gas.get(random.nextInt(4)));
             entity.setCollectTime(collectTime);
-            collectTime = DateUtil.offsetMinute(collectTime,5);
+            collectTime = DateUtil.offsetMinute(collectTime, 5);
             list.add(entity);
         }
 
@@ -118,7 +121,7 @@ public class CreateEverydayDataTask {
 
     @Async
     @Scheduled(cron = "1 0 0 * * ?")
-    //@Scheduled(cron = "1 52 18 * * ?")
+        //@Scheduled(cron = "1 52 18 * * ?")
     void callPigHealthData() {
         System.out.println("callPigHealthData begin------->");
         indoorEnvironmentDao.callPigHealthData();
@@ -126,7 +129,15 @@ public class CreateEverydayDataTask {
 
     }
 
+    private double getTemperature() {
+        BigDecimal bigDecimal = new BigDecimal(Math.random() * 3 + 23).setScale(1, BigDecimal.ROUND_HALF_UP);
+        return bigDecimal.doubleValue();
+    }
 
+    private double getHumidity(){
+        BigDecimal bigDecimal = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
+        return bigDecimal.doubleValue();
+    }
 
 
 }

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

@@ -1,10 +1,10 @@
 <?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">
+<mapper namespace="com.huimv.apiservice.dao.FarmDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.huimv.apiservice.entity.PastureEntity" id="pastureMap">
+    <resultMap type="com.huimv.apiservice.entity.FarmEntity" id="pastureMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="location" column="location"/>

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

@@ -9,7 +9,7 @@
         <result property="pigstyId" column="pigsty_id"/>
         <result property="temperature" column="temperature"/>
         <result property="humidity" column="humidity"/>
-        <result property="gas" column="gas"/>
+        <result property="airQuality" column="gas"/>
         <result property="date" column="date"/>
         <result property="collectTime" column="collect_time"/>
         <result property="deleted" column="deleted"/>
@@ -18,15 +18,26 @@
     </resultMap>
 
     <insert id="batchInsertData" >
-        insert into mgt_indoor_environment(pigsty_id,date,temperature,humidity,gas,collect_time)
+        insert into mgt_indoor_environment(pigsty_id,date,temperature,humidity,air_quality,collect_time)
         values
         <foreach collection="list" item="item"  separator="," >
-            (#{item.pigstyId},
             #{item.date},
+            #{item.farmId},
+            (#{item.pigstyId},
             #{item.temperature},
             #{item.humidity},
-            #{item.gas},
+            #{item.airQuality},
             #{item.collectTime})
         </foreach>
     </insert>
+
+    <select id="select" resultType="com.huimv.apiservice.entity.vo.IndoorEnvVo">
+        SELECT
+          collect_time,
+          temperature,
+          humidity,
+          air_quality
+        FROM mgt_indoor_environment
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -14,16 +14,24 @@
     </resultMap>
 
     <insert id="batchInsertData">
-        insert into mgt_outdoor_environment(date,temperature,humidity,gas,collect_time)
+        insert into mgt_outdoor_environment(date,temperature,humidity,air_quality,collect_time)
         values
         <foreach collection="list" item="item"  separator="," >
             (#{item.date},
+            #{item.farmId},
             #{item.temperature},
             #{item.humidity},
-            #{item.gas},
+            #{item.airQuality},
             #{item.collectTime})
         </foreach>
     </insert>
 
+    <select id="select" resultType="com.huimv.apiservice.entity.vo.OutdoorEnvVo">
+        SELECT
+
+        FROM mgt_outdoor_environment
+        ${ew.customSqlSegment}
+    </select>
+
 
 </mapper>

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

@@ -66,7 +66,7 @@
     <select id="selectPastureNameByPigstyId" resultType="java.lang.String">
         SELECT mc.name
         FROM mgt_pigsty zs
-        JOIN mgt_pasture mc
+        JOIN mgt_farm mc
         ON zs.pasture_id = mc.id
         WHERE zs.id = #{pigstyId}
     </select>
@@ -76,9 +76,26 @@
     </select>
 
     <select id="selectPagePigBaseVoByBreedName" resultMap="pigBaseVoMap">
-        SELECT child.eartag c_eartag,child.weight,child.day_age,child.breed,child.birthday,feeder.`name` feeder,zs.number pigsty,p.number period_number,child.in_fence_time,child.out_fence_time,
-               m.eartag m_eartag,m.breed m_breed,mother.childbirth_weight m_weight,m.origin_place m_origin_place,mother.pregnancy_date pregnancy_date,mother.childbirth_count child_count,
-               father.eartag f_eartag,father.breed f_breed,father.origin_place f_origin_place
+        SELECT
+            child.eartag c_eartag,
+            child.weight,
+            child.day_age,
+            child.breed,
+            child.birthday,
+            feeder.`name` feeder,
+            zs.number pigsty,
+            p.number period_number,
+            child.in_fence_time,
+            child.out_fence_time,
+            m.eartag m_eartag,
+            m.breed m_breed,
+            mother.childbirth_weight m_weight,
+            m.origin_place m_origin_place,
+            mother.pregnancy_date pregnancy_date,
+            mother.childbirth_count child_count,
+            father.eartag f_eartag,
+            father.breed f_breed,
+            father.origin_place f_origin_place
         FROM mgt_year_pig_base child
         LEFT JOIN mgt_pigsty zs ON child.pigsty_id = zs.id
         LEFT JOIN mgt_period p ON child.period_id = p.id

huimv-smart-apiservice/src/test/java/com/huimv/apiservice/HuimvSmartApiserviceApplicationTests.java

@@ -5,18 +5,13 @@ import cn.hutool.core.date.DateUtil;
 import com.huimv.apiservice.dao.IndoorEnvironmentDao;
 import com.huimv.apiservice.dao.OutdoorEnvironmentDao;
 import com.huimv.apiservice.dao.PigDao;
-import com.huimv.apiservice.dao.SowChildbirthDao;
 import com.huimv.apiservice.entity.IndoorEnvironmentEntity;
 import com.huimv.apiservice.entity.OutdoorEnvironmentEntity;
-import com.huimv.apiservice.entity.SowChildbirthEntity;
-import com.huimv.apiservice.entity.YearPigBaseEntity;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 
 @SpringBootTest
@@ -31,8 +26,6 @@ class HuimvSmartApiserviceApplicationTests {
     @Autowired
     private PigDao pigDao;
 
-    @Autowired
-    private SowChildbirthDao sowChildbirthDao;
 
     @Test
     void contextLoads() {
@@ -74,7 +67,7 @@ class HuimvSmartApiserviceApplicationTests {
             BigDecimal bigDecimal2 = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
             double humidity = bigDecimal2.doubleValue();
             entity.setHumidity(humidity);
-            entity.setGas(gas.get(random.nextInt(5)));
+            entity.setAirQuality(gas.get(random.nextInt(5)));
             entity.setCollectTime(collectTime);
             collectTime = DateUtil.offsetMinute(collectTime,5);
 //            System.out.println(entity);
@@ -117,7 +110,7 @@ class HuimvSmartApiserviceApplicationTests {
             BigDecimal bigDecimal2 = new BigDecimal(Math.random() * 0.3 + 0.3).setScale(2, BigDecimal.ROUND_HALF_UP);
             double humidity = bigDecimal2.doubleValue();
             entity.setHumidity(humidity);
-            entity.setGas(gas.get(random.nextInt(4)));
+            entity.setAirQuality(gas.get(random.nextInt(4)));
             entity.setCollectTime(collectTime);
             collectTime = DateUtil.offsetMinute(collectTime,5);
             list.add(entity);

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

@@ -91,10 +91,8 @@ public class BaseBloodlineController {
     * @Time        : 14:33
     */
     @RequestMapping("/findAll")
-    public R delete(){
-
-
-        return R.ok().put("baseBloodline",baseBloodlineService.list());
+    public R findAll(){
+        return R.ok().put("all",baseBloodlineService.list());
     }
 
 

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

@@ -1,9 +1,11 @@
  package com.huimv.management.controller;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -101,4 +103,11 @@ public class PeriodController {
         return R.ok().put("all",list);
     }
 
+    @PostMapping("/test")
+    public R transferPeriod(@RequestBody List<PeriodEntity> list) {
+        return null;
+    }
+
+
+
 }

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

@@ -85,9 +85,8 @@ public class UnitController {
      * 查询全部
      */
     @RequestMapping("/findAll")
-    public R findAll(){
-        List list = unitService.findAll();
-
+    public R findAll(@RequestParam("formFarmId") Integer formFarmId){
+        List list = unitService.findAll(formFarmId);
         return R.ok().put("all",list);
     }
 

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

@@ -27,7 +27,7 @@ public class OutdoorEnvironmentEntity implements Serializable {
     /**
      * 牧场id
      */
-    private String farmId;
+    private Integer farmId;
     /**
      * 日期
      */

huimv-smart-management/src/main/java/com/huimv/management/service/UnitService.java

@@ -18,7 +18,7 @@ public interface UnitService extends IService<UnitEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List findAll();
+    List findAll(Integer formFarmId);
 
     List findAllByFarmId(Integer id);
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/DrinkingWaterServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.exception.RRException;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.Query;
 import com.huimv.management.dao.DrinkingWaterDao;
@@ -57,22 +58,19 @@ public class DrinkingWaterServiceImpl extends ServiceImpl<DrinkingWaterDao, Drin
         }
 
         //牧场名称
-        String farmName = (String) params.get("farmName");
-        if (farmName != null) {
-            LambdaQueryWrapper<FarmEntity> query = Wrappers.<FarmEntity>lambdaQuery().like(FarmEntity::getName, farmName);
-            List<Integer> idList = farmDao.selectIdList(query);
-            if (CollUtil.isNotEmpty(idList)) {
-                queryWrapper.in("water.farm_id", idList);
-            }
+        String farmId = (String) params.get("formFarmId");
+        if (StringUtils.isNotBlank(farmId)) {
+                queryWrapper.eq("water.farm_id", Integer.parseInt(farmId));
         }
 
-        //猪舍名称
-        String pigstyName = (String) params.get("pigstyName");
-        if (StringUtils.isNotEmpty(pigstyName)) {
-            List<Integer> idList = pigstyDao.selectIdListByPigstyName(pigstyName);
-            if (CollUtil.isNotEmpty(idList)) {
-                queryWrapper.in("water.pigsty_id", idList);
+        //猪舍id
+        String pigstyId = (String) params.get("pigstyId");
+        if (StringUtils.isNotBlank(pigstyId)) {
+            if (StringUtils.isBlank(farmId)) {
+                throw new RRException("请先选择要查询的牧场!");
             }
+            int val = Integer.parseInt(pigstyId);
+            queryWrapper.eq("water.pigsty_id", val);
         }
 
         //开始时间

huimv-smart-management/src/main/java/com/huimv/management/service/impl/IndoorEnvironmentServiceImpl.java

@@ -56,7 +56,7 @@ public class IndoorEnvironmentServiceImpl extends ServiceImpl<IndoorEnvironmentD
             queryWrapper.eq("env.abnormal_status", Boolean.parseBoolean(abnormalStatus));
         }
 
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotBlank(farmId)) {
             queryWrapper.eq("env.farm_id",Integer.parseInt(farmId));
         }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/OutdoorEnvironmentServiceImpl.java

@@ -50,7 +50,7 @@ public class OutdoorEnvironmentServiceImpl extends ServiceImpl<OutdoorEnvironmen
             queryWrapper.eq("env.abnormal_status", Boolean.parseBoolean(abnormalStatus));
         }
 
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotBlank(farmId)) {
             queryWrapper.eq("env.farm_id",Integer.parseInt(farmId));
         }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyServiceImpl.java

@@ -37,20 +37,13 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
 
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
         String farmId = (String) params.get("formFarmId");
-        lambdaQuery.eq(StringUtils.isNotBlank(farmId),PigstyEntity::getFarmId,farmId);
+        lambdaQuery.eq(StringUtils.isNotBlank(farmId),PigstyEntity::getFarmId,Integer.parseInt(farmId));
 
         String keywords = (String) params.get("keywords");
-        //没有参数
-        if (keywords == null || keywords.equals("")){
-            IPage<PigstyEntity> page = this.page(
-                    new Query<PigstyEntity>().getPage(params),
-                    new QueryWrapper<PigstyEntity>()
-            );
-            return new PageUtils(page);
+        if (StringUtils.isNotBlank(keywords)) {
+            lambdaQuery.like(PigstyEntity::getNumber,keywords);
         }
 
-
-
         lambdaQuery.like(PigstyEntity::getNumber,keywords);
         IPage<PigstyEntity> page = page(this.page(
                 new Query<PigstyEntity>().getPage(params)

huimv-smart-management/src/main/java/com/huimv/management/service/impl/ThresholdManagementServiceImpl.java

@@ -33,7 +33,7 @@ public class ThresholdManagementServiceImpl extends ServiceImpl<ThresholdManagem
 
         QueryWrapper<ThresholdManagementVo> queryWrapper = new QueryWrapper<>();
 
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotBlank(farmId)) {
             queryWrapper.eq("farm_id", Integer.parseInt(farmId));
         }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/UnitServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.dao.PigstyDao;
 import com.huimv.management.entity.UnitEntity;
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,33 +27,23 @@ import com.huimv.management.service.UnitService;
 @Service("unitService")
 public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements UnitService {
 
-   /* @Override
-    public PageUtils queryPage(Map<String, Object> params) {
-        IPage<UnitEntity> page = this.page(
-                new Query<UnitEntity>().getPage(params),
-                new QueryWrapper<UnitEntity>()
-        );
-
-        return new PageUtils(page);
-    }*/
-
     @Autowired
     private UnitDao unitDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-
         LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
+
+        String formFarmId = (String) params.get("formFarmId");
+        System.out.println(formFarmId);
+        if (StringUtils.isNotBlank(formFarmId)) {
+            lambdaQuery.eq(UnitEntity::getFarmId, Integer.parseInt(formFarmId));
+        }
+
         String keywords = (String) params.get("keywords");
-        //没有参数
-        if (keywords == null || keywords.equals("")){
-            IPage<UnitEntity> page = this.page(
-                    new Query<UnitEntity>().getPage(params),
-                    new QueryWrapper<UnitEntity>()
-            );
-            return new PageUtils(page);
+        if (StringUtils.isNotBlank(keywords)) {
+            lambdaQuery.like(UnitEntity::getNumber, keywords);
         }
-        lambdaQuery.like(UnitEntity::getNumber,keywords);
         IPage<UnitEntity> page = page(this.page(
                 new Query<UnitEntity>().getPage(params)
         ), lambdaQuery);
@@ -59,8 +51,9 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
     }
 
     @Override
-    public List findAll() {
+    public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(UnitEntity::getFarmId, formFarmId);
         List<UnitEntity> pastureEntities = unitDao.selectList(lambdaQuery);
         return pastureEntities;
     }
@@ -68,7 +61,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
     @Override
     public List findAllByFarmId(Integer id) {
         LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(UnitEntity::getPigstyId,id);
+        lambdaQuery.eq(UnitEntity::getPigstyId, id);
         List<UnitEntity> pastureEntities = unitDao.selectList(lambdaQuery);
         return pastureEntities;
     }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/WarningInfoServiceImpl.java

@@ -49,7 +49,7 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoDao, WarningI
             queryWrapper.eq("warn.warning_type",Short.parseShort(warningType));
         }
         //牧场id
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotBlank(farmId)) {
             queryWrapper.eq(StringUtils.isNotBlank(farmId),"warn.farm_id",Integer.parseInt(farmId));
         }