فهرست منبع

提交首页环控查看

zhuoning 4 سال پیش
والد
کامیت
a52eb207ee
21فایلهای تغییر یافته به همراه1673 افزوده شده و 40 حذف شده
  1. 21 0
      huimv-ql-farm/huimv-ql-environment/pom.xml
  2. 4 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/HuimvEnvironmentApplication.java
  3. 7 2
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/controller/EnvironmentControlController.java
  4. 571 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/BaseColumnPeriodEntity.java
  5. 447 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/BasePigpenEntity.java
  6. 93 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkAqEntity.java
  7. 93 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkSdEntity.java
  8. 93 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkWdEntity.java
  9. 13 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/BaseColumnPeriodRepo.java
  10. 13 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/BasePigpenRepo.java
  11. 24 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkAqRepo.java
  12. 22 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkSdRepo.java
  13. 33 0
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkWdRepo.java
  14. 3 2
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/IEnvironmentControlService.java
  15. 95 3
      huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/EnvironmentControlServiceImpl.java
  16. 0 31
      huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev.yml
  17. 18 0
      huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev1.yml
  18. 43 0
      huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev2.yml
  19. 47 0
      huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev3.yml
  20. 2 1
      huimv-ql-farm/huimv-ql-environment/src/main/resources/application.properties
  21. 31 1
      huimv-ql-farm/pom.xml

+ 21 - 0
huimv-ql-farm/huimv-ql-environment/pom.xml

@@ -11,5 +11,26 @@
 
     <artifactId>huimv-ql-environment</artifactId>
 
+    <!-- 定义版本号 -->
+    <properties>
+        <java.version>1.8</java.version>
+        <dynamic.version>2.4.2</dynamic.version>
+    </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>${dynamic.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-log4j2</artifactId>-->
+<!--        </dependency>-->
+    </dependencies>
 </project>

+ 4 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/HuimvEnvironmentApplication.java

@@ -1,9 +1,13 @@
 package com.huimv.environment;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+// 单数据源
 @SpringBootApplication
+// 多数据源
+//@SpringBootApplication(exclude = DruidDataSourceAutoConfigure.class)
 public class HuimvEnvironmentApplication {
 
     public static void main(String[] args) {

+ 7 - 2
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/controller/EnvironmentControlController.java

@@ -1,6 +1,7 @@
 package com.huimv.environment.controller;
 
-import com.huimv.common.utils.Result;
+
+import com.huimv.common.result.Result;
 import com.huimv.environment.service.IEnvironmentControlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -19,9 +20,13 @@ public class EnvironmentControlController {
     @Autowired
     private IEnvironmentControlService envControlService;
 
+    @RequestMapping(value = "/getFarm",method = RequestMethod.GET)
     public Result getPigpen(@RequestParam(value = "farmId") Integer farmId){
         return envControlService.getPigpenByFarm(farmId);
     }
 
-//    public Result get
+    @RequestMapping(value = "/getLastEnvData",method = RequestMethod.GET)
+    public Result getLastEnvData(@RequestParam(value = "lqId") Integer lqId){
+        return envControlService.getLastEnvData(lqId);
+    }
 }

+ 571 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/BaseColumnPeriodEntity.java

@@ -0,0 +1,571 @@
+package com.huimv.environment.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.Timestamp;
+
+/**
+ * 档案-栏期信息
+ */
+@Entity
+@Table(name = "base_column_period")
+public class BaseColumnPeriodEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 牧场编号
+     */
+    @Column(name = "ZSID", nullable = false)
+    private Integer ZSID;
+
+    /**
+     * 栏期名称
+     */
+    @Column(name = "LQMC")
+    private String LQMC;
+
+    /**
+     * 建栏时间
+     */
+    @Column(name = "JLSJ")
+    private Date JLSJ;
+
+    /**
+     * 计划栏结束时间
+     */
+    @Column(name = "JHLJSSJ")
+    private Date JHLJSSJ;
+
+    /**
+     * 实际栏结束时间
+     */
+    @Column(name = "SJLJSSJ")
+    private Date SJLJSSJ;
+
+    /**
+     * 入栏平均体重
+     */
+    @Column(name = "RLPJTZ")
+    private BigDecimal RLPJTZ;
+
+    /**
+     * 在栏动物数
+     */
+    @Column(name = "ZLS")
+    private BigDecimal ZLS;
+
+    /**
+     * 入栏动物数
+     */
+    @Column(name = "RLS")
+    private BigDecimal RLS;
+
+    /**
+     * 死亡动物数
+     */
+    @Column(name = "SWS")
+    private BigDecimal SWS;
+
+    /**
+     * 售出动物数
+     */
+    @Column(name = "SCS")
+    private BigDecimal SCS;
+
+    /**
+     * 隔离动物数
+     */
+    @Column(name = "GLS")
+    private BigDecimal GLS;
+
+    /**
+     * 耳标丢失数
+     */
+    @Column(name = "EBDSS")
+    private BigDecimal EBDSS;
+
+    /**
+     * 管理员
+     */
+    @Column(name = "GLY")
+    private String GLY;
+
+    /**
+     * 挑选开始日期
+     */
+    @Column(name = "TXKSRQ")
+    private Date TXKSRQ;
+
+    /**
+     * 挑选开始标识
+     */
+    @Column(name = "TXKSBZ")
+    private BigDecimal TXKSBZ;
+
+    /**
+     * 统计开始日期
+     */
+    @Column(name = "TJKSRQ")
+    private Date TJKSRQ;
+
+    /**
+     * 初始遗留饲料量
+     */
+    @Column(name = "CSYLSLL")
+    private BigDecimal CSYLSLL;
+
+    /**
+     * 结束剩余饲料量
+     */
+    @Column(name = "JSSYSLL")
+    private BigDecimal JSSYSLL;
+
+    /**
+     * 修改人
+     */
+    @Column(name = "XGR")
+    private String XGR;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "XGSJ")
+    private Timestamp XGSJ;
+
+    /**
+     * 作废标识
+     */
+    @Column(name = "ZFBZ")
+    private Integer ZFBZ;
+
+    /**
+     * 出栏数
+     */
+    @Column(name = "CLS")
+    private BigDecimal CLS;
+
+    /**
+     * 淘汰数
+     */
+    @Column(name = "TTS")
+    private BigDecimal TTS;
+
+    /**
+     * 体重统计时间
+     */
+    @Column(name = "TZTJSJ")
+    private Timestamp TZTJSJ;
+
+    /**
+     * 入栏日龄
+     */
+    @Column(name = "RLRL")
+    private String RLRL;
+
+    /**
+     * ID
+     */
+    public void setID(Integer ID) {
+        this.ID = ID;
+    }
+
+    /**
+     * ID
+     */
+    public Integer getID() {
+        return ID;
+    }
+
+    /**
+     * 牧场编号
+     */
+    public void setZSID(Integer ZSID) {
+        this.ZSID = ZSID;
+    }
+
+    /**
+     * 牧场编号
+     */
+    public Integer getZSID() {
+        return ZSID;
+    }
+
+    /**
+     * 栏期名称
+     */
+    public void setLQMC(String LQMC) {
+        this.LQMC = LQMC;
+    }
+
+    /**
+     * 栏期名称
+     */
+    public String getLQMC() {
+        return LQMC;
+    }
+
+    /**
+     * 建栏时间
+     */
+    public void setJLSJ(Date JLSJ) {
+        this.JLSJ = JLSJ;
+    }
+
+    /**
+     * 建栏时间
+     */
+    public Date getJLSJ() {
+        return JLSJ;
+    }
+
+    /**
+     * 计划栏结束时间
+     */
+    public void setJHLJSSJ(Date JHLJSSJ) {
+        this.JHLJSSJ = JHLJSSJ;
+    }
+
+    /**
+     * 计划栏结束时间
+     */
+    public Date getJHLJSSJ() {
+        return JHLJSSJ;
+    }
+
+    /**
+     * 实际栏结束时间
+     */
+    public void setSJLJSSJ(Date SJLJSSJ) {
+        this.SJLJSSJ = SJLJSSJ;
+    }
+
+    /**
+     * 实际栏结束时间
+     */
+    public Date getSJLJSSJ() {
+        return SJLJSSJ;
+    }
+
+    /**
+     * 入栏平均体重
+     */
+    public void setRLPJTZ(BigDecimal RLPJTZ) {
+        this.RLPJTZ = RLPJTZ;
+    }
+
+    /**
+     * 入栏平均体重
+     */
+    public BigDecimal getRLPJTZ() {
+        return RLPJTZ;
+    }
+
+    /**
+     * 在栏动物数
+     */
+    public void setZLS(BigDecimal ZLS) {
+        this.ZLS = ZLS;
+    }
+
+    /**
+     * 在栏动物数
+     */
+    public BigDecimal getZLS() {
+        return ZLS;
+    }
+
+    /**
+     * 入栏动物数
+     */
+    public void setRLS(BigDecimal RLS) {
+        this.RLS = RLS;
+    }
+
+    /**
+     * 入栏动物数
+     */
+    public BigDecimal getRLS() {
+        return RLS;
+    }
+
+    /**
+     * 死亡动物数
+     */
+    public void setSWS(BigDecimal SWS) {
+        this.SWS = SWS;
+    }
+
+    /**
+     * 死亡动物数
+     */
+    public BigDecimal getSWS() {
+        return SWS;
+    }
+
+    /**
+     * 售出动物数
+     */
+    public void setSCS(BigDecimal SCS) {
+        this.SCS = SCS;
+    }
+
+    /**
+     * 售出动物数
+     */
+    public BigDecimal getSCS() {
+        return SCS;
+    }
+
+    /**
+     * 隔离动物数
+     */
+    public void setGLS(BigDecimal GLS) {
+        this.GLS = GLS;
+    }
+
+    /**
+     * 隔离动物数
+     */
+    public BigDecimal getGLS() {
+        return GLS;
+    }
+
+    /**
+     * 耳标丢失数
+     */
+    public void setEBDSS(BigDecimal EBDSS) {
+        this.EBDSS = EBDSS;
+    }
+
+    /**
+     * 耳标丢失数
+     */
+    public BigDecimal getEBDSS() {
+        return EBDSS;
+    }
+
+    /**
+     * 管理员
+     */
+    public void setGLY(String GLY) {
+        this.GLY = GLY;
+    }
+
+    /**
+     * 管理员
+     */
+    public String getGLY() {
+        return GLY;
+    }
+
+    /**
+     * 挑选开始日期
+     */
+    public void setTXKSRQ(Date TXKSRQ) {
+        this.TXKSRQ = TXKSRQ;
+    }
+
+    /**
+     * 挑选开始日期
+     */
+    public Date getTXKSRQ() {
+        return TXKSRQ;
+    }
+
+    /**
+     * 挑选开始标识
+     */
+    public void setTXKSBZ(BigDecimal TXKSBZ) {
+        this.TXKSBZ = TXKSBZ;
+    }
+
+    /**
+     * 挑选开始标识
+     */
+    public BigDecimal getTXKSBZ() {
+        return TXKSBZ;
+    }
+
+    /**
+     * 统计开始日期
+     */
+    public void setTJKSRQ(Date TJKSRQ) {
+        this.TJKSRQ = TJKSRQ;
+    }
+
+    /**
+     * 统计开始日期
+     */
+    public Date getTJKSRQ() {
+        return TJKSRQ;
+    }
+
+    /**
+     * 初始遗留饲料量
+     */
+    public void setCSYLSLL(BigDecimal CSYLSLL) {
+        this.CSYLSLL = CSYLSLL;
+    }
+
+    /**
+     * 初始遗留饲料量
+     */
+    public BigDecimal getCSYLSLL() {
+        return CSYLSLL;
+    }
+
+    /**
+     * 结束剩余饲料量
+     */
+    public void setJSSYSLL(BigDecimal JSSYSLL) {
+        this.JSSYSLL = JSSYSLL;
+    }
+
+    /**
+     * 结束剩余饲料量
+     */
+    public BigDecimal getJSSYSLL() {
+        return JSSYSLL;
+    }
+
+    /**
+     * 修改人
+     */
+    public void setXGR(String XGR) {
+        this.XGR = XGR;
+    }
+
+    /**
+     * 修改人
+     */
+    public String getXGR() {
+        return XGR;
+    }
+
+    /**
+     * 修改时间
+     */
+    public void setXGSJ(Timestamp XGSJ) {
+        this.XGSJ = XGSJ;
+    }
+
+    /**
+     * 修改时间
+     */
+    public Timestamp getXGSJ() {
+        return XGSJ;
+    }
+
+    /**
+     * 作废标识
+     */
+    public void setZFBZ(Integer ZFBZ) {
+        this.ZFBZ = ZFBZ;
+    }
+
+    /**
+     * 作废标识
+     */
+    public Integer getZFBZ() {
+        return ZFBZ;
+    }
+
+    /**
+     * 出栏数
+     */
+    public void setCLS(BigDecimal CLS) {
+        this.CLS = CLS;
+    }
+
+    /**
+     * 出栏数
+     */
+    public BigDecimal getCLS() {
+        return CLS;
+    }
+
+    /**
+     * 淘汰数
+     */
+    public void setTTS(BigDecimal TTS) {
+        this.TTS = TTS;
+    }
+
+    /**
+     * 淘汰数
+     */
+    public BigDecimal getTTS() {
+        return TTS;
+    }
+
+    /**
+     * 体重统计时间
+     */
+    public void setTZTJSJ(Timestamp TZTJSJ) {
+        this.TZTJSJ = TZTJSJ;
+    }
+
+    /**
+     * 体重统计时间
+     */
+    public Timestamp getTZTJSJ() {
+        return TZTJSJ;
+    }
+
+    /**
+     * 入栏日龄
+     */
+    public void setRLRL(String RLRL) {
+        this.RLRL = RLRL;
+    }
+
+    /**
+     * 入栏日龄
+     */
+    public String getRLRL() {
+        return RLRL;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseColumnPeriodEntity{" +
+                "ID=" + ID + '\'' +
+                "ZSID=" + ZSID + '\'' +
+                "LQMC=" + LQMC + '\'' +
+                "JLSJ=" + JLSJ + '\'' +
+                "JHLJSSJ=" + JHLJSSJ + '\'' +
+                "SJLJSSJ=" + SJLJSSJ + '\'' +
+                "RLPJTZ=" + RLPJTZ + '\'' +
+                "ZLS=" + ZLS + '\'' +
+                "RLS=" + RLS + '\'' +
+                "SWS=" + SWS + '\'' +
+                "SCS=" + SCS + '\'' +
+                "GLS=" + GLS + '\'' +
+                "EBDSS=" + EBDSS + '\'' +
+                "GLY=" + GLY + '\'' +
+                "TXKSRQ=" + TXKSRQ + '\'' +
+                "TXKSBZ=" + TXKSBZ + '\'' +
+                "TJKSRQ=" + TJKSRQ + '\'' +
+                "CSYLSLL=" + CSYLSLL + '\'' +
+                "JSSYSLL=" + JSSYSLL + '\'' +
+                "XGR=" + XGR + '\'' +
+                "XGSJ=" + XGSJ + '\'' +
+                "ZFBZ=" + ZFBZ + '\'' +
+                "CLS=" + CLS + '\'' +
+                "TTS=" + TTS + '\'' +
+                "TZTJSJ=" + TZTJSJ + '\'' +
+                "RLRL=" + RLRL + '\'' +
+                '}';
+    }
+}

+ 447 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/BasePigpenEntity.java

@@ -0,0 +1,447 @@
+package com.huimv.environment.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Column;
+import javax.persistence.GenerationType;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+import java.sql.Timestamp;
+import java.io.Serializable;
+import javax.persistence.Id;
+ 
+/**
+ * 档案-猪舍信息
+ */
+@Entity
+@Table(name = "base_pigpen")
+public class BasePigpenEntity implements Serializable {
+
+private static final long serialVersionUID = 1L;
+
+/**
+ * ID
+ */
+@Id
+@GeneratedValue(strategy = GenerationType.IDENTITY)@Column(name = "ID", nullable = false)
+private Integer ID;
+
+/**
+ * 牧场编号
+ */
+@Column(name = "MCID", nullable = false)
+private Integer MCID;
+
+/**
+ * 猪舍名称
+ */
+@Column(name = "ZSMC")
+private String ZSMC;
+
+/**
+ * 采食区1
+ */
+@Column(name = "CSQ1")
+private String CSQ1;
+
+/**
+ * 采食区2
+ */
+@Column(name = "CSQ2")
+private String CSQ2;
+
+/**
+ * 分离区
+ */
+@Column(name = "FLQ")
+private String FLQ;
+
+/**
+ * 当前栏期
+ */
+@Column(name = "DQLQ")
+private String DQLQ;
+
+/**
+ * 养殖阶段
+ */
+@Column(name = "YZJD")
+private String YZJD;
+
+/**
+ * 管理员ID
+ */
+@Column(name = "GLY")
+private Integer GLY;
+
+/**
+ * 管理员姓名
+ */
+@Column(name = "GLYXM")
+private String GLYXM;
+
+/**
+ * 修改人
+ */
+@Column(name = "XGR")
+private String XGR;
+
+/**
+ * 修改日期
+ */
+@Column(name = "XGSJ")
+private Timestamp XGSJ;
+
+/**
+ * 作废标识
+ */
+@Column(name = "ZFBZ")
+private Integer ZFBZ;
+
+/**
+ * 猪舍标志
+ */
+@Column(name = "ZSBZ")
+private Integer ZSBZ;
+
+/**
+ * 所属区域
+ */
+@Column(name = "SSQY")
+private Integer SSQY;
+
+/**
+ * 料槽标志 1-智能料槽 2-普通料槽
+ */
+@Column(name = "LCBZ")
+private Integer LCBZ;
+
+/**
+ * 环控标志 1-智能环控 2-普通环控
+ */
+@Column(name = "HKBZ")
+private Integer HKBZ;
+
+/**
+ * 置顶标志 0-不置顶 1-置顶
+ */
+@Column(name = "ZDBZ")
+private Integer ZDBZ;
+
+/**
+ * 猪舍区域
+ */
+@Column(name = "ZSQY")
+private Integer ZSQY;
+
+/**
+ * 视频监控
+ */
+@Column(name = "SPJK")
+private String SPJK;
+
+/**
+ * ID
+ */
+public  void  setID(Integer ID) {
+this.ID = ID;
+}
+
+/**
+ * ID
+ */
+public Integer getID() {
+return ID;
+}
+
+/**
+ * 牧场编号
+ */
+public  void  setMCID(Integer MCID) {
+this.MCID = MCID;
+}
+
+/**
+ * 牧场编号
+ */
+public Integer getMCID() {
+return MCID;
+}
+
+/**
+ * 猪舍名称
+ */
+public  void  setZSMC(String ZSMC) {
+this.ZSMC = ZSMC;
+}
+
+/**
+ * 猪舍名称
+ */
+public String getZSMC() {
+return ZSMC;
+}
+
+/**
+ * 采食区1
+ */
+public  void  setCSQ1(String CSQ1) {
+this.CSQ1 = CSQ1;
+}
+
+/**
+ * 采食区1
+ */
+public String getCSQ1() {
+return CSQ1;
+}
+
+/**
+ * 采食区2
+ */
+public  void  setCSQ2(String CSQ2) {
+this.CSQ2 = CSQ2;
+}
+
+/**
+ * 采食区2
+ */
+public String getCSQ2() {
+return CSQ2;
+}
+
+/**
+ * 分离区
+ */
+public  void  setFLQ(String FLQ) {
+this.FLQ = FLQ;
+}
+
+/**
+ * 分离区
+ */
+public String getFLQ() {
+return FLQ;
+}
+
+/**
+ * 当前栏期
+ */
+public  void  setDQLQ(String DQLQ) {
+this.DQLQ = DQLQ;
+}
+
+/**
+ * 当前栏期
+ */
+public String getDQLQ() {
+return DQLQ;
+}
+
+/**
+ * 养殖阶段
+ */
+public  void  setYZJD(String YZJD) {
+this.YZJD = YZJD;
+}
+
+/**
+ * 养殖阶段
+ */
+public String getYZJD() {
+return YZJD;
+}
+
+/**
+ * 管理员ID
+ */
+public  void  setGLY(Integer GLY) {
+this.GLY = GLY;
+}
+
+/**
+ * 管理员ID
+ */
+public Integer getGLY() {
+return GLY;
+}
+
+/**
+ * 管理员姓名
+ */
+public  void  setGLYXM(String GLYXM) {
+this.GLYXM = GLYXM;
+}
+
+/**
+ * 管理员姓名
+ */
+public String getGLYXM() {
+return GLYXM;
+}
+
+/**
+ * 修改人
+ */
+public  void  setXGR(String XGR) {
+this.XGR = XGR;
+}
+
+/**
+ * 修改人
+ */
+public String getXGR() {
+return XGR;
+}
+
+/**
+ * 修改日期
+ */
+public  void  setXGSJ(Timestamp XGSJ) {
+this.XGSJ = XGSJ;
+}
+
+/**
+ * 修改日期
+ */
+public Timestamp getXGSJ() {
+return XGSJ;
+}
+
+/**
+ * 作废标识
+ */
+public  void  setZFBZ(Integer ZFBZ) {
+this.ZFBZ = ZFBZ;
+}
+
+/**
+ * 作废标识
+ */
+public Integer getZFBZ() {
+return ZFBZ;
+}
+
+/**
+ * 猪舍标志
+ */
+public  void  setZSBZ(Integer ZSBZ) {
+this.ZSBZ = ZSBZ;
+}
+
+/**
+ * 猪舍标志
+ */
+public Integer getZSBZ() {
+return ZSBZ;
+}
+
+/**
+ * 所属区域
+ */
+public  void  setSSQY(Integer SSQY) {
+this.SSQY = SSQY;
+}
+
+/**
+ * 所属区域
+ */
+public Integer getSSQY() {
+return SSQY;
+}
+
+/**
+ * 料槽标志 1-智能料槽 2-普通料槽
+ */
+public  void  setLCBZ(Integer LCBZ) {
+this.LCBZ = LCBZ;
+}
+
+/**
+ * 料槽标志 1-智能料槽 2-普通料槽
+ */
+public Integer getLCBZ() {
+return LCBZ;
+}
+
+/**
+ * 环控标志 1-智能环控 2-普通环控
+ */
+public  void  setHKBZ(Integer HKBZ) {
+this.HKBZ = HKBZ;
+}
+
+/**
+ * 环控标志 1-智能环控 2-普通环控
+ */
+public Integer getHKBZ() {
+return HKBZ;
+}
+
+/**
+ * 置顶标志 0-不置顶 1-置顶
+ */
+public  void  setZDBZ(Integer ZDBZ) {
+this.ZDBZ = ZDBZ;
+}
+
+/**
+ * 置顶标志 0-不置顶 1-置顶
+ */
+public Integer getZDBZ() {
+return ZDBZ;
+}
+
+/**
+ * 猪舍区域
+ */
+public  void  setZSQY(Integer ZSQY) {
+this.ZSQY = ZSQY;
+}
+
+/**
+ * 猪舍区域
+ */
+public Integer getZSQY() {
+return ZSQY;
+}
+
+/**
+ * 视频监控
+ */
+public  void  setSPJK(String SPJK) {
+this.SPJK = SPJK;
+}
+
+/**
+ * 视频监控
+ */
+public String getSPJK() {
+return SPJK;
+}
+
+@Override
+public String toString() {
+return "BasePigpenEntity{" +
+    "ID=" + ID + '\'' +
+    "MCID=" + MCID + '\'' +
+    "ZSMC=" + ZSMC + '\'' +
+    "CSQ1=" + CSQ1 + '\'' +
+    "CSQ2=" + CSQ2 + '\'' +
+    "FLQ=" + FLQ + '\'' +
+    "DQLQ=" + DQLQ + '\'' +
+    "YZJD=" + YZJD + '\'' +
+    "GLY=" + GLY + '\'' +
+    "GLYXM=" + GLYXM + '\'' +
+    "XGR=" + XGR + '\'' +
+    "XGSJ=" + XGSJ + '\'' +
+    "ZFBZ=" + ZFBZ + '\'' +
+    "ZSBZ=" + ZSBZ + '\'' +
+    "SSQY=" + SSQY + '\'' +
+    "LCBZ=" + LCBZ + '\'' +
+    "HKBZ=" + HKBZ + '\'' +
+    "ZDBZ=" + ZDBZ + '\'' +
+    "ZSQY=" + ZSQY + '\'' +
+    "SPJK=" + SPJK + '\'' +
+    '}';
+}
+}

+ 93 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkAqEntity.java

@@ -0,0 +1,93 @@
+package com.huimv.environment.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "sj_hk_aq")
+public class SjHkAqEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Double ID;
+
+    @Column(name = "LQID")
+    private Double LQID;
+
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    @Column(name = "DQAQ")
+    private BigDecimal DQAQ;
+
+    @Column(name = "CJSJ", nullable = false)
+    private Timestamp CJSJ;
+
+    @Column(name = "SCSJ", nullable = false)
+    private Timestamp SCSJ;
+
+    public void setID(Double ID) {
+        this.ID = ID;
+    }
+
+    public Double getID() {
+        return ID;
+    }
+
+    public void setLQID(Double LQID) {
+        this.LQID = LQID;
+    }
+
+    public Double getLQID() {
+        return LQID;
+    }
+
+    public void setCGQID(String CGQID) {
+        this.CGQID = CGQID;
+    }
+
+    public String getCGQID() {
+        return CGQID;
+    }
+
+    public void setDQAQ(BigDecimal DQAQ) {
+        this.DQAQ = DQAQ;
+    }
+
+    public BigDecimal getDQAQ() {
+        return DQAQ;
+    }
+
+    public void setCJSJ(Timestamp CJSJ) {
+        this.CJSJ = CJSJ;
+    }
+
+    public Timestamp getCJSJ() {
+        return CJSJ;
+    }
+
+    public void setSCSJ(Timestamp SCSJ) {
+        this.SCSJ = SCSJ;
+    }
+
+    public Timestamp getSCSJ() {
+        return SCSJ;
+    }
+
+    @Override
+    public String toString() {
+        return "SjHkAqEntity{" +
+                "ID=" + ID + '\'' +
+                "LQID=" + LQID + '\'' +
+                "CGQID=" + CGQID + '\'' +
+                "DQAQ=" + DQAQ + '\'' +
+                "CJSJ=" + CJSJ + '\'' +
+                "SCSJ=" + SCSJ + '\'' +
+                '}';
+    }
+}

+ 93 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkSdEntity.java

@@ -0,0 +1,93 @@
+package com.huimv.environment.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "sj_hk_sd")
+public class SjHkSdEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Double ID;
+
+    @Column(name = "LQID")
+    private Double LQID;
+
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    @Column(name = "DQSD")
+    private BigDecimal DQSD;
+
+    @Column(name = "CJSJ", nullable = false)
+    private Timestamp CJSJ;
+
+    @Column(name = "SCSJ", nullable = false)
+    private Timestamp SCSJ;
+
+    public void setID(Double ID) {
+        this.ID = ID;
+    }
+
+    public Double getID() {
+        return ID;
+    }
+
+    public void setLQID(Double LQID) {
+        this.LQID = LQID;
+    }
+
+    public Double getLQID() {
+        return LQID;
+    }
+
+    public void setCGQID(String CGQID) {
+        this.CGQID = CGQID;
+    }
+
+    public String getCGQID() {
+        return CGQID;
+    }
+
+    public void setDQSD(BigDecimal DQSD) {
+        this.DQSD = DQSD;
+    }
+
+    public BigDecimal getDQSD() {
+        return DQSD;
+    }
+
+    public void setCJSJ(Timestamp CJSJ) {
+        this.CJSJ = CJSJ;
+    }
+
+    public Timestamp getCJSJ() {
+        return CJSJ;
+    }
+
+    public void setSCSJ(Timestamp SCSJ) {
+        this.SCSJ = SCSJ;
+    }
+
+    public Timestamp getSCSJ() {
+        return SCSJ;
+    }
+
+    @Override
+    public String toString() {
+        return "SjHkSdEntity{" +
+                "ID=" + ID + '\'' +
+                "LQID=" + LQID + '\'' +
+                "CGQID=" + CGQID + '\'' +
+                "DQSD=" + DQSD + '\'' +
+                "CJSJ=" + CJSJ + '\'' +
+                "SCSJ=" + SCSJ + '\'' +
+                '}';
+    }
+}

+ 93 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SjHkWdEntity.java

@@ -0,0 +1,93 @@
+package com.huimv.environment.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "sj_hk_wd")
+public class SjHkWdEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Double ID;
+
+    @Column(name = "LQID")
+    private Double LQID;
+
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    @Column(name = "DQWD")
+    private BigDecimal DQWD;
+
+    @Column(name = "CJSJ", nullable = false)
+    private Timestamp CJSJ;
+
+    @Column(name = "SCSJ", nullable = false)
+    private Timestamp SCSJ;
+
+    public void setID(Double ID) {
+        this.ID = ID;
+    }
+
+    public Double getID() {
+        return ID;
+    }
+
+    public void setLQID(Double LQID) {
+        this.LQID = LQID;
+    }
+
+    public Double getLQID() {
+        return LQID;
+    }
+
+    public void setCGQID(String CGQID) {
+        this.CGQID = CGQID;
+    }
+
+    public String getCGQID() {
+        return CGQID;
+    }
+
+    public void setDQWD(BigDecimal DQWD) {
+        this.DQWD = DQWD;
+    }
+
+    public BigDecimal getDQWD() {
+        return DQWD;
+    }
+
+    public void setCJSJ(Timestamp CJSJ) {
+        this.CJSJ = CJSJ;
+    }
+
+    public Timestamp getCJSJ() {
+        return CJSJ;
+    }
+
+    public void setSCSJ(Timestamp SCSJ) {
+        this.SCSJ = SCSJ;
+    }
+
+    public Timestamp getSCSJ() {
+        return SCSJ;
+    }
+
+    @Override
+    public String toString() {
+        return "SjHkWdEntity{" +
+                "ID=" + ID + '\'' +
+                "LQID=" + LQID + '\'' +
+                "CGQID=" + CGQID + '\'' +
+                "DQWD=" + DQWD + '\'' +
+                "CJSJ=" + CJSJ + '\'' +
+                "SCSJ=" + SCSJ + '\'' +
+                '}';
+    }
+}

+ 13 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/BaseColumnPeriodRepo.java

@@ -0,0 +1,13 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.BaseColumnPeriodEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface BaseColumnPeriodRepo extends JpaRepository<BaseColumnPeriodEntity, Integer>, JpaSpecificationExecutor<BaseColumnPeriodEntity> {
+    @Query(nativeQuery = true , value = "SELECT * FROM base_column_period WHERE id IN(SELECT MAX(id) FROM base_column_period WHERE zsid IN(?1) GROUP BY zsid)")
+    List<BaseColumnPeriodEntity> getLqid(List<Integer> zsids);
+}

+ 13 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/BasePigpenRepo.java

@@ -0,0 +1,13 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.BasePigpenEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface BasePigpenRepo extends JpaRepository<BasePigpenEntity, Integer>, JpaSpecificationExecutor<BasePigpenEntity> {
+    @Query(nativeQuery = true , value = "SELECT * FROM base_pigpen WHERE mcid=?1 AND ZFBZ=0")
+    List<BasePigpenEntity> getAllPigpen(int mcid);
+}

+ 24 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkAqRepo.java

@@ -0,0 +1,24 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.SjHkAqEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface SjHkAqRepo extends JpaRepository<SjHkAqEntity, Void>, JpaSpecificationExecutor<SjHkAqEntity> {
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE id IN(SELECT MAX(id) FROM sj_hk_aq WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 GROUP BY lqid)")
+    List<SjHkAqEntity> getLastAq(List<Integer> lqids, String todayDate);
+
+    //    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND function(\"date_format\",CJSJ,\"%Y-%m-%d\")=?2 ORDER BY cjsj DESC LIMIT 0,1)")
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND date_format(CJSJ,'%Y-%m-%d')= DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
+    SjHkAqEntity getLastAq(Integer lqid,String todayDate);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,SCSJ,CJSJ FROM sj_hk_aq WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
+    List<SjHkAqEntity> getAmmoniaOnToday(Integer lqid, String beforeDateTime);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,SCSJ,CJSJ FROM sj_hk_aq WHERE lqid=?1 ORDER BY cjsj DESC LIMIT 10")
+    List<SjHkAqEntity> getAmmonia(Integer lqid, String beforeDateTime);
+
+}

+ 22 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkSdRepo.java

@@ -0,0 +1,22 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.SjHkSdEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface SjHkSdRepo extends JpaRepository<SjHkSdEntity, Void>, JpaSpecificationExecutor<SjHkSdEntity> {
+    @Query(nativeQuery = true , value = "SELECT ID,LQID,CGQID,DQSD,CJSJ,SCSJ FROM sj_hk_sd WHERE id IN( SELECT MAX(id) FROM sj_hk_sd WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2  GROUP BY lqid)")
+    List<SjHkSdEntity> getLastSd(List lqidList, String date);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,CJSJ,SCSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
+    SjHkSdEntity getLastSd(Integer lqid, String todayDate);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,SCSJ,CJSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
+    List<SjHkSdEntity> getHumidityOnToday(Integer lqid, String beforeDateTime);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,SCSJ,CJSJ FROM sj_hk_sd WHERE lqid=?1 ORDER BY cjsj DESC limit 10")
+    List<SjHkSdEntity> getHumidity(Integer lqid, String beforeDateTime);
+}

+ 33 - 0
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SjHkWdRepo.java

@@ -0,0 +1,33 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.SjHkWdEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface SjHkWdRepo extends JpaRepository<SjHkWdEntity, Void>, JpaSpecificationExecutor<SjHkWdEntity> {
+    @Query(nativeQuery = true , value = "SELECT id,lqid,cgqid,dqwd,cjsj,scsj FROM sj_hk_wd WHERE id IN(SELECT MAX(id) FROM sj_hk_wd WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2  GROUP BY lqid)")
+    List<SjHkWdEntity> getLastWd(List lqidList, String date);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,CJSJ,SCSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
+    SjHkWdEntity getLastWd(Integer lqid, String todayDate);
+
+    /**
+     * @Method      : getTemperatureOnToday
+     * @Description : 获取今天的温度
+     * @Params      : [lqid, todayDate]
+     * @Return      : com.huimv.env.dao.entity.SjHkWdEntity
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29
+     * @Time        : 13:31
+     */
+//    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 ORDER BY cjsj DESC ")
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
+    List<SjHkWdEntity> getTemperatureOnToday(Integer lqid, String todayDate);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 ORDER BY cjsj DESC LIMIT 30")
+    List<SjHkWdEntity> getTemperature(Integer lqid, String beforeDateTime);
+}

+ 3 - 2
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/IEnvironmentControlService.java

@@ -1,9 +1,10 @@
 package com.huimv.environment.service;
 
-import com.huimv.common.utils.Result;
+import com.huimv.common.result.Result;
 
 public interface IEnvironmentControlService {
 
+    Result getPigpenByFarm(Integer farmId);
 
-    Result getPigpenByFarm(int farmId);
+    Result getLastEnvData(Integer lqId);
 }

+ 95 - 3
huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/service/impl/EnvironmentControlServiceImpl.java

@@ -1,9 +1,21 @@
 package com.huimv.environment.service.impl;
 
-import com.huimv.common.utils.Result;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.common.date.DateUtil;
+import com.huimv.common.result.Result;
+import com.huimv.common.result.ResultCode;
+import com.huimv.environment.entity.*;
+import com.huimv.environment.repo.*;
 import com.huimv.environment.service.IEnvironmentControlService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -14,10 +26,90 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 public class EnvironmentControlServiceImpl implements IEnvironmentControlService {
+    @Autowired
+    private BasePigpenRepo basePigpenRepo;
+    @Autowired
+    private BaseColumnPeriodRepo baseColumnPeriodRepo;
+    @Autowired
+    private SjHkAqRepo aqRepo;
+    @Autowired
+    private SjHkSdRepo sdRepo;
+    @Autowired
+    private SjHkWdRepo wdRepo;
 
     @Override
-    public Result getPigpenByFarm(int farmId) {
+    public Result getPigpenByFarm(Integer farmId) {
+        //--读取所有猪舍
+        List<BasePigpenEntity> zsdsList = basePigpenRepo.getAllPigpen(farmId);
+//        System.out.println("zsdsList.size>>"+zsdsList.size());
+        if (zsdsList.size() == 0) {
+            //返回出错
+            return new Result(10001, "牧场id(" + farmId + ")中的猪舍为0", false);
+        }
+        List zsidList = new ArrayList();
+        for (BasePigpenEntity zsdaEntity : zsdsList) {
+            zsidList.add(zsdaEntity.getID());
+        }
+//        System.out.println("zsSb>>"+zsidList.toString());
+        //--读取所有栏期
+        List<BaseColumnPeriodEntity> lqdaEntityList = baseColumnPeriodRepo.getLqid(zsidList);
+//        System.out.println("栏期length>>"+lqdaEntityList.size());
+        if (lqdaEntityList.size() == 0) {
+            //返回出错.
+            return new Result(10002, "这个牧场(" + farmId + ")中的猪舍暂无相关任何栏期", false);
+        }
+        List lqidList = new ArrayList();
+//        for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
+//            lqidList.add(lqdaEntity.getID());
+//        }
+//        System.out.println("lqidList>>"+lqidList.toString());
+        JSONArray zsJa = new JSONArray();
+        for (BasePigpenEntity zsdaEntity : zsdsList) {
+            int zsid = zsdaEntity.getID();
+            JSONObject zsJo = new JSONObject();
+            zsJa.add(zsJo);
+            zsJo.put("zsid", zsid);
+            zsJo.put("zsmc", zsdaEntity.getZSMC());
+            for (BaseColumnPeriodEntity lqdaEntity : lqdaEntityList) {
+                if (lqdaEntity.getZSID() == zsid) {
+                    zsJo.put("lqid", lqdaEntity.getID());
+                    break;
+                }
+            }
+        }
+        return new Result(ResultCode.SUCCESS, zsJa);
+    }
 
-        return null;
+    @Override
+//    @DS("master")
+    public Result getLastEnvData(Integer lqid) {
+        String todayDate = new DateUtil().formatDate(new Date());
+        System.out.println(" todayDate>>"+todayDate);
+        System.out.println(" lqid>>"+lqid);
+        JSONObject envJo = new JSONObject();
+        envJo.put("lqid",lqid);
+        //--读取最新氨气
+        SjHkAqEntity aqEntity = aqRepo.getLastAq(lqid, todayDate);
+        System.out.println("aqEntity>>" + aqEntity);
+        if (aqEntity != null) {
+            envJo.put("ammonia", aqEntity.getDQAQ());
+        } else {
+            envJo.put("ammonia", "");
+        }
+        //--读取最新湿度
+        SjHkSdEntity sdEntity = sdRepo.getLastSd(lqid, todayDate);
+        if (sdEntity != null) {
+            envJo.put("humidity", sdEntity.getDQSD());
+        } else {
+            envJo.put("humidity", "");
+        }
+        //--读取最新温度
+        SjHkWdEntity wdEntity = wdRepo.getLastWd(lqid, todayDate);
+        if (wdEntity != null) {
+            envJo.put("temp", wdEntity.getDQWD());
+        } else {
+            envJo.put("temp", "");
+        }
+        return new Result(ResultCode.SUCCESS, envJo);
     }
 }

+ 0 - 31
huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev.yml

@@ -1,31 +0,0 @@
-server:
-  port: 8085
-spring:
-  application:
-    name: environment
-
-#  datasource:
-#    url: jdbc:mysql://192.168.1.7:3306/eartag_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: hm123456
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#  jpa:
-#    show-sql: true
-#    database: mysql
-#    hibernate:
-#      ddl-auto: update
-#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-#    open-in-view: true
-
-    #  redis:
-#    database: 0
-#    host: 119.3.84.55
-#    port: 6379
-#    password: hm123456
-#    jedis:
-#      pool:
-#        max-active: 20
-#        max-wait: -1
-#        max-idle: 10
-#        min-idle: 0
-#    timeout: 5000

+ 18 - 0
huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev1.yml

@@ -0,0 +1,18 @@
+server:
+  port: 8085
+spring:
+  application:
+    name: environment
+
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    show-sql: true

+ 43 - 0
huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev2.yml

@@ -0,0 +1,43 @@
+server:
+  port: 8085
+spring:
+  application:
+    name: environment
+
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://122.112.250.26:3306/env_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
+        slave:
+          url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: huimv
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
+        third:
+          url: jdbc:mysql://121.36.134.218:3306/device_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true

+ 47 - 0
huimv-ql-farm/huimv-ql-environment/src/main/resources/application-dev3.yml

@@ -0,0 +1,47 @@
+server:
+  port: 8085
+spring:
+  application:
+    name: environment
+
+  datasource:
+    dynamic:
+      druid: #以下是全局默认值,可以全局更改
+        initial-size: 0
+        max-active: 8
+        min-idle: 2
+        max-wait: -1
+        min-evictable-idle-time-millis: 30000
+        max-evictable-idle-time-millis: 30000
+        time-between-eviction-runs-millis: 0
+        validation-query: select 1
+        validation-query-timeout: -1
+        test-on-borrow: false
+        test-on-return: false
+        test-while-idle: true
+        pool-prepared-statements: true
+        max-open-prepared-statements: 100
+        filters: stat,wall
+        share-prepared-statements: true
+      datasource:
+        master:
+          url: jdbc:mysql://192.168.1.7:3306/env_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: hm123456
+          druid:
+            initial-size: 5
+        slave:
+          url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          druid:
+            initial-size: 3
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true

+ 2 - 1
huimv-ql-farm/huimv-ql-environment/src/main/resources/application.properties

@@ -1 +1,2 @@
-spring.profiles.active=dev
+spring.profiles.active=dev1
+

+ 31 - 1
huimv-ql-farm/pom.xml

@@ -21,8 +21,10 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>huimv-ql-farm</name>
     <description>Demo project for Spring Boot</description>
+
     <properties>
         <java.version>1.8</java.version>
+        <dynamic.version>2.4.2</dynamic.version>
     </properties>
 
     <dependencies>
@@ -42,8 +44,36 @@
             <artifactId>huimv-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-    </dependencies>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
+        <!-- JPA -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- alibaba的druid数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.23</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>${dynamic.version}</version>
+        </dependency>
+
+    </dependencies>
 
     <build>
         <plugins>