修复环控问题

shiwan/env/pom.xml

@@ -2,20 +2,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+<!--    <parent>-->
+<!--        <groupId>com.huimv</groupId>-->
+<!--        <artifactId>shiwan</artifactId>-->
+<!--        <version>0.0.1-SNAPSHOT</version>-->
+<!--        <relativePath>../my-parent</relativePath>-->
+<!--    </parent>-->
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.1</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.huimv</groupId>
+        <artifactId>shiwan</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>com.huimv</groupId>
+
     <artifactId>env</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>env</name>
     <description>Demo project for Spring Boot</description>
 
+    <!-- 定义版本号 -->
     <properties>
         <java.version>1.8</java.version>
+        <dynamic.version>2.4.2</dynamic.version>
     </properties>
 
     <dependencies>
@@ -29,6 +36,31 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <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>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

shiwan/env/src/main/java/com/huimv/env/controller/EnvironmentController.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.huimv.common.utils.Result;
 import com.huimv.env.service.IEnvironmentService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Project : huimv.shiwan
@@ -68,7 +65,7 @@ public class EnvironmentController {
      * @Date        : 2020/12/28       
      * @Time        : 20:48
      */
-    @RequestMapping("/getZsda")
+    @RequestMapping(value="/getZsda",method = RequestMethod.GET)
     public Result getZsda(@RequestParam(value = "mcid") Integer mcid){
         //
         return environmentService.getZsda(mcid);
@@ -84,11 +81,30 @@ public class EnvironmentController {
      * @Date        : 2020/12/28       
      * @Time        : 20:51
      */
-    @RequestMapping("/getLastEnvByLq")
+    @RequestMapping(value="/getLastEnvByLq",method = RequestMethod.GET)
     public Result getLastEnvByLq(@RequestParam(value = "lqid") Integer lqid){
         //
         return environmentService.getLastEnvByLq(lqid);
     }
 
+    @RequestMapping(value="/getTemperature",method = RequestMethod.GET)
+    public Result getTemperature(@RequestParam(value = "lqid") Integer lqid){
+        // 获取
+        return environmentService.getTemperatureOnToday(lqid);
+    }
+
+    @RequestMapping(value="/getAmmoniaAndHumidity",method = RequestMethod.GET)
+    public Result getAmmoniaAndHumidity(@RequestParam(value = "lqid") Integer lqid){
+
+        return environmentService.getAmmoniaAndHumidityOnToday(lqid);
+    }
+
+    @RequestMapping("/details")
+    public Result getEnvDetails() {
+        // 获取环保数据
+        return environmentService.getEnvDetails();
+    }
+
+
 
 }

shiwan/env/src/main/java/com/huimv/env/dao/entity/EnvironmentDataEntity.java

@@ -0,0 +1,176 @@
+package com.huimv.env.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "environment_data")
+public class EnvironmentDataEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "ad")
+    private String ad;
+
+    @Column(name = "date", nullable = false)
+    private String date;
+
+    @Column(name = "date_time")
+    private String dateTime;
+
+    @Column(name = "hour")
+    private Integer hour;
+
+    @Column(name = "hxxyl")
+    private String hxxyl;
+
+    @Column(name = "ph")
+    private String ph;
+
+    @Column(name = "qn")
+    private String qn;
+
+    @Column(name = "write_time")
+    private Timestamp writeTime;
+
+    @Column(name = "ws")
+    private Float ws;
+
+    @Column(name = "wslj")
+    private Float wslj;
+
+    @Column(name = "zd")
+    private String zd;
+
+    @Column(name = "zl")
+    private String zl;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setAd(String ad) {
+        this.ad = ad;
+    }
+
+    public String getAd() {
+        return ad;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDateTime(String dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getDateTime() {
+        return dateTime;
+    }
+
+    public void setHour(Integer hour) {
+        this.hour = hour;
+    }
+
+    public Integer getHour() {
+        return hour;
+    }
+
+    public void setHxxyl(String hxxyl) {
+        this.hxxyl = hxxyl;
+    }
+
+    public String getHxxyl() {
+        return hxxyl;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setQn(String qn) {
+        this.qn = qn;
+    }
+
+    public String getQn() {
+        return qn;
+    }
+
+    public void setWriteTime(Timestamp writeTime) {
+        this.writeTime = writeTime;
+    }
+
+    public Timestamp getWriteTime() {
+        return writeTime;
+    }
+
+    public void setWs(Float ws) {
+        this.ws = ws;
+    }
+
+    public Float getWs() {
+        return ws;
+    }
+
+    public void setWslj(Float wslj) {
+        this.wslj = wslj;
+    }
+
+    public Float getWslj() {
+        return wslj;
+    }
+
+    public void setZd(String zd) {
+        this.zd = zd;
+    }
+
+    public String getZd() {
+        return zd;
+    }
+
+    public void setZl(String zl) {
+        this.zl = zl;
+    }
+
+    public String getZl() {
+        return zl;
+    }
+
+    @Override
+    public String toString() {
+        return "EnvironmentDataEntity{" +
+                "id=" + id + '\'' +
+                "ad=" + ad + '\'' +
+                "date=" + date + '\'' +
+                "dateTime=" + dateTime + '\'' +
+                "hour=" + hour + '\'' +
+                "hxxyl=" + hxxyl + '\'' +
+                "ph=" + ph + '\'' +
+                "qn=" + qn + '\'' +
+                "writeTime=" + writeTime + '\'' +
+                "ws=" + ws + '\'' +
+                "wslj=" + wslj + '\'' +
+                "zd=" + zd + '\'' +
+                "zl=" + zl + '\'' +
+                '}';
+    }
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/EnvironmentDataEntityRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.env.dao.repo;
+
+import com.huimv.env.dao.entity.EnvironmentDataEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+public interface EnvironmentDataEntityRepository extends JpaRepository<EnvironmentDataEntity, Integer>, JpaSpecificationExecutor<EnvironmentDataEntity> {
+
+    @Query(nativeQuery = true, value = "select * from environment_data order by id desc limit 1")
+    EnvironmentDataEntity getOneLastEnvData();
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/SjHkAqEntityRepository.java

@@ -13,6 +13,12 @@ public interface SjHkAqEntityRepository extends JpaRepository<SjHkAqEntity, Inte
     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')=?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);
 }

shiwan/env/src/main/java/com/huimv/env/dao/repo/SjHkSdEntityRepository.java

@@ -13,6 +13,12 @@ public interface SjHkSdEntityRepository extends JpaRepository<SjHkSdEntity, Inte
     @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')=?2 ORDER BY cjsj DESC LIMIT 0,1")
+    @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);
 }

shiwan/env/src/main/java/com/huimv/env/dao/repo/SjHkWdEntityRepository.java

@@ -14,6 +14,23 @@ public interface SjHkWdEntityRepository extends JpaRepository<SjHkWdEntity, Inte
     @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')=?2 ORDER BY cjsj DESC LIMIT 0,1")
+    @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);
 }

shiwan/env/src/main/java/com/huimv/env/service/IEnvironmentService.java

@@ -29,4 +29,10 @@ public interface IEnvironmentService {
     Result getZsda(int mcid);
 
     Result getLastEnvByLq(Integer lqid);
+
+    Result getTemperatureOnToday(Integer lqid);
+
+    Result getAmmoniaAndHumidityOnToday(Integer lqid);
+
+    Result getEnvDetails();
 }

shiwan/env/src/main/java/com/huimv/env/service/impl/EnvironmentServiceImpl.java

@@ -38,7 +38,19 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
     private SjHkSdEntityRepository sdEntityRepo;
     @Autowired
     private SjHkWdEntityRepository wdEntityRepo;
+    @Autowired
+    private EnvironmentDataEntityRepository environmentDataRepo;
 
+    /**
+     * @Method      : getLastEnvData
+     * @Description : 
+     * @Params      : [mcid]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:29
+     */
     @Override
     @DS("slave")
     public Result getLastEnvData(int mcid) {
@@ -173,7 +185,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
 //        System.out.println("栏期length>>"+lqdaEntityList.size());
         if (lqdaEntityList.size() == 0) {
             //返回出错.
-            return new Result(10002, "这个牧场(" + mcid + ")中的猪舍暂无相关任何栏期", false);
+            return new Result(10002, "这个牧场(" + mcid + ")中的猪舍暂未设置相关栏期", false);
         }
         List lqidList = new ArrayList();
         for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
@@ -200,6 +212,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
             JSONObject envJo = new JSONObject();
             envJa.add(envJo);
             envJo.put("id",zsdaEntity.getID());
+            envJo.put("lqid",lqid);
             envJo.put("zsmc",zsdaEntity.getZSMC());
             //--读取最新氨气
             SjHkAqEntity aqEntity = aqEntityRepo.getLastAq(lqid, todayDate);
@@ -273,7 +286,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
             zsJo.put("zsmc", zsdaEntity.getZSMC());
             for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
                 if (lqdaEntity.getZSID() == zsid) {
-                    zsJo.put("lqid", zsdaEntity.getID());
+                    zsJo.put("lqid", lqdaEntity.getID());
                     break;
                 }
             }
@@ -295,9 +308,9 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
     @DS("slave")
     public Result getLastEnvByLq(Integer lqid) {
         String todayDate = new DateUtil().formatDate(new Date());
-//        JSONArray envJa = new JSONArray();
+        System.out.println(" todayDate>>"+todayDate);
+        System.out.println(" lqid>>"+lqid);
         JSONObject envJo = new JSONObject();
-//        envJa.add(envJo);
         envJo.put("lqid",lqid);
         //--读取最新氨气
         SjHkAqEntity aqEntity = aqEntityRepo.getLastAq(lqid, todayDate);
@@ -324,5 +337,117 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
         return new Result(ResultCode.SUCCESS, envJo);
     }
 
+    /**
+     * @Method      : getTemperatureOnToday
+     * @Description : 获取今天温度
+     * @Params      : [lqid]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:29
+     */
+    @Override
+    @DS("slave")
+    public Result getTemperatureOnToday(Integer lqid) {
+        String beforeDateTime = new DateUtil().beforeTime(1);
+        JSONObject dataJo = new JSONObject();
+        //--读取最新温度
+//        List<SjHkWdEntity> wdEntityList = wdEntityRepo.getTemperatureOnToday(lqid, beforeDateTime);
+        List<SjHkWdEntity> wdEntityList = wdEntityRepo.getTemperature(lqid, beforeDateTime);
+        List<SjHkWdEntity> newList = new ArrayList();
+        for(int a=wdEntityList.size()-1;a>=0;a--){
+            SjHkWdEntity wdEntity = wdEntityList.get(a);
+            newList.add(wdEntity);
+        }
+        if (newList.size()>0) {
+            JSONArray tempJa = new JSONArray();
+            JSONArray timeJa = new JSONArray();
+            for(SjHkWdEntity wdEntity: newList){
+                System.out.println(""+wdEntity.getCJSJ()+","+wdEntity.getDQWD());
+                String dateTime = wdEntity.getCJSJ().toString();
+                String hourAndMin =  dateTime.substring(11,16);
+                timeJa.add(hourAndMin);
+                tempJa.add(wdEntity.getDQWD());
+            }
+            dataJo.put("timeData",timeJa);
+            dataJo.put("wenduList",tempJa);
+        }
+        return new Result(ResultCode.SUCCESS, dataJo);
+    }
+
+    /**
+     * @Method      : getAmmoniaAndHumidityOnToday
+     * @Description : 获取今天氨气和湿度
+     * @Params      : [lqid]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:28
+     */
+    @Override
+    @DS("slave")
+    public Result getAmmoniaAndHumidityOnToday(Integer lqid) {
+        String beforeDateTime = new DateUtil().beforeTime(3);
+        JSONArray timeJa = new JSONArray();
+        JSONObject dataJo = new JSONObject();
+        System.out.println("lqid>>"+lqid);
+        System.out.println("beforeDateTime>>"+beforeDateTime);
+        //--读取最新氨气
+//        List<SjHkAqEntity> aqEntityList = aqEntityRepo.getAmmoniaOnToday(lqid, beforeDateTime);
+        List<SjHkAqEntity> aqEntityList = aqEntityRepo.getAmmonia(lqid, beforeDateTime);
+        System.out.println("读取最新氨气>>"+aqEntityList.size());
+        List<SjHkAqEntity> newList = new ArrayList();
+        for(int a=aqEntityList.size()-1;a>=0;a--){
+            SjHkAqEntity aqEntity = aqEntityList.get(a);
+            newList.add(aqEntity);
+        }
+        System.out.println("读取最新氨气 newList>>"+newList.size());
+
+        if (newList.size()>0) {
+            JSONArray ammoniaJa = new JSONArray();
+            for(SjHkAqEntity aqEntity:newList){
+                String dateTime = aqEntity.getCJSJ().toString();
+                String hourAndMin =  dateTime.substring(11,16);
+                timeJa.add(hourAndMin);
+                ammoniaJa.add(aqEntity.getDQAQ());
+            }
+            dataJo.put("timeData",timeJa);
+            dataJo.put("anqiList",ammoniaJa);
+        }
+        //--读取最新湿度
+//        List<SjHkSdEntity> sdEntityList = sdEntityRepo.getHumidityOnToday(lqid, beforeDateTime);
+        List<SjHkSdEntity> sdEntityList = sdEntityRepo.getHumidity(lqid, beforeDateTime);
+        System.out.println("读取最新氨气>>"+sdEntityList.size());
+        List<SjHkSdEntity> newList2 = new ArrayList();
+        for(int a=sdEntityList.size()-1;a>=0;a--){
+            SjHkSdEntity sdEntity = sdEntityList.get(a);
+            newList2.add(sdEntity);
+        }
+        System.out.println("读取最新氨气 newList2>>"+newList2.size());
+        if (newList2.size()>0) {
+            JSONArray humidityJa = new JSONArray();
+            for(SjHkSdEntity sdEntity:newList2){
+                humidityJa.add(sdEntity.getDQSD());
+            }
+            dataJo.put("shiduList",humidityJa);
+        }
+        return new Result(ResultCode.SUCCESS, dataJo);
+    }
+
+    @Override
+    @DS("third")
+    public Result getEnvDetails() {
+        /**  */
+        EnvironmentDataEntity environmentData = environmentDataRepo.getOneLastEnvData();
+        System.out.println("environmentData:" + environmentData);
+        if (environmentData == null) {
+            return new Result(10003,"没有环控数据",false);
+        } else {
+            return new Result(ResultCode.SUCCESS,environmentData);
+        }
+    }
+
 
 }

shiwan/env/src/main/resources/application-prod.yml

@@ -34,7 +34,7 @@ spring:
             initial-size: 5
         slave:
           url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-          username: huimv
+          username: root
           password: hm123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           druid:

shiwan/env/src/main/resources/application-test.yml

@@ -9,23 +9,32 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://192.168.1.7:3306/env_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          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: 20
-          max-idle: 8
-          min-idle: 8
-          initial-size: 10
+          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: 20
-          max-idle: 8
-          min-idle: 8
-          initial-size: 10
+          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