修改污水排放实时取数排序问题。

huimv-farm-environ/pom.xml

@@ -31,11 +31,11 @@
         <!--            <scope>compile</scope>-->
         <!--        </dependency>-->
         <!--ICC-->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <artifactId>huimv-common</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.dahuatech.icc</groupId>
             <artifactId>java-sdk-oauth</artifactId>
@@ -50,6 +50,12 @@
             <!-- jdk版本 -->
         </dependency>
 
+        <!-- huimv.com -->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -33,6 +33,7 @@ public class EnvironController {
      */
     @RequestMapping(value = "/getLastEnviron",method = RequestMethod.GET)
     public Result getLastEnviron(@RequestParam(value = "farmId",required = true) Integer farmId){
+        System.out.println("-------------------------------------------------------");
         //
         return environ.getLastEnviron(farmId);
     }

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

@@ -5,11 +5,15 @@ 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;
 import java.util.Optional;
 
 public interface EnvHourRepo extends JpaRepository<EnvHourEntity, Integer>, JpaSpecificationExecutor<EnvHourEntity> {
 
     //
-    @Query(nativeQuery = true,value ="SELECT * FROM env_hour where farm_id=?1 ORDER BY id DESC LIMIT 1")
+    @Query(nativeQuery = true,value ="SELECT * FROM env_hour where farm_id=?1 ORDER BY add_time DESC LIMIT 1")
     Optional<EnvHourEntity> findLastOne(Integer farmId);
+
+    @Query(nativeQuery = true,value ="SELECT * FROM env_hour where farm_id=?1 ORDER BY add_time DESC LIMIT 1")
+    EnvHourEntity findLastOne2(Integer farmId);
 }

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

@@ -49,8 +49,23 @@ public class EnvironImpl implements IEnviron {
     @Override
     public Result getLastEnviron(Integer farmId){
         Optional<EnvHourEntity> optional = envHourRepo.findLastOne(farmId);
+        System.out.println("optional.isPresent()>>"+optional.isPresent());
         if(optional.isPresent()){
             EnvHourEntity envHourEntity = optional.get();
+            System.out.println("envHourEntity>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+envHourEntity.toString());
+            return new Result(ResultCode.SUCCESS,envHourEntity);
+//            return new Result(ResultCode.SUCCESS,JSON.toJSON(envHourEntity).toString());
+        }else{
+            return new Result(Const.ERROR_CODE_NOTEXIST,Const.ERROR_MSG_NOTEXIST,false);
+        }
+    }
+
+//    @Override
+    public Result getLastEnviron2(Integer farmId){
+        EnvHourEntity envHourEntity = envHourRepo.findLastOne2(farmId);
+        System.out.println("envHourEntity>>"+envHourEntity);
+        if(envHourEntity != null){
+            System.out.println("envHourEntity>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+envHourEntity.toString());
             return new Result(ResultCode.SUCCESS,envHourEntity);
 //            return new Result(ResultCode.SUCCESS,JSON.toJSON(envHourEntity).toString());
         }else{

huimv-farm-environ/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ server:
   port: 8092
 spring:
   application:
-    name: pigfarm-local-device
+    name: huimv-farm-environ
   #------DataSource-----
   datasource:
     url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai

huimv-farm-environ/src/main/resources/application.properties

@@ -1,6 +1,6 @@
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #spring.profiles.active=prod3
 #spring.profiles.active=demo
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=prod2