获取环保数据：新增farmId参数。

huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/environ/controller/EnvironController.java

@@ -3,10 +3,7 @@ package com.huimv.env.environ.controller;
 import com.huimv.common.result.Result;
 import com.huimv.env.environ.service.IEnviron;
 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.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Project : huimv.shiwan
@@ -34,8 +31,8 @@ public class EnvironController {
      * @Time        : 22:25
      */
     @RequestMapping(value = "/getLastEnviron",method = RequestMethod.GET)
-    public Result getLastEnviron(){
+    public Result getLastEnviron(@RequestParam(value = "farmId",required = true) Integer farmId){
         //
-        return environ.getLastEnviron();
+        return environ.getLastEnviron(farmId);
     }
 }

huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/environ/dao/repo/EnvHourRepo.java

@@ -9,6 +9,6 @@ import java.util.Optional;
 
 public interface EnvHourRepo extends JpaRepository<EnvHourEntity, Integer>, JpaSpecificationExecutor<EnvHourEntity> {
 
-    @Query(nativeQuery = true,value ="SELECT * FROM env_hour ORDER BY id DESC LIMIT 1")
-    Optional<EnvHourEntity> findLastOne();
+    @Query(nativeQuery = true,value ="SELECT * FROM env_hour where farm_id=?1 ORDER BY id DESC LIMIT 1")
+    Optional<EnvHourEntity> findLastOne(Integer farmId);
 }

huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/environ/service/IEnviron.java

@@ -4,5 +4,5 @@ import com.huimv.common.result.Result;
 
 public interface IEnviron {
     //
-    Result getLastEnviron();
+    Result getLastEnviron(Integer farmId);
 }

huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/environ/service/impl/EnvironImpl.java

@@ -36,12 +36,10 @@ public class EnvironImpl implements IEnviron {
      * @Time        : 23:28
      */
     @Override
-    public Result getLastEnviron(){
-//        Example
-        Optional<EnvHourEntity> optional = envHourRepo.findLastOne();
+    public Result getLastEnviron(Integer farmId){
+        Optional<EnvHourEntity> optional = envHourRepo.findLastOne(farmId);
         if(optional.isPresent()){
             EnvHourEntity envHourEntity = optional.get();
-            System.out.println("envHourEntity>>"+envHourEntity);
             return new Result(ResultCode.SUCCESS,envHourEntity);
 //            return new Result(ResultCode.SUCCESS,JSON.toJSON(envHourEntity).toString());
         }else{

huimv-farm-v2/huimv-env/src/test/java/com/huimv/env/environ/service/EnvironTest.java

@@ -20,7 +20,7 @@ public class EnvironTest {
     @Test
     public void testGet(){
         //
-        System.out.println(environ.getLastEnviron()); ;
+        System.out.println(environ.getLastEnviron(1)); ;
 
     }
 }