修复获取最近7天环境数据功能。

huimv-farm-v2/huimv-env/pom.xml

@@ -14,12 +14,12 @@
 <!--        <dependency>-->
 <!--            <groupId>com.huimv</groupId>-->
 <!--            <artifactId>huimv-common</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--            <version>1.0-SNAPSHOT</version>-->
 <!--        </dependency>-->
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!-- JPA -->
         <dependency>

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

@@ -1,6 +1,6 @@
 package com.huimv.env.environ.controller;
 
-import com.huimv.common.result.Result;
+import com.huimv.common.utils.Result;
 import com.huimv.env.environ.service.IEnviron;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -11,6 +11,9 @@ import java.util.List;
 public interface EnvDayRepo extends JpaRepository<EnvDayEntity, Integer>, JpaSpecificationExecutor<EnvDayEntity> {
 
     //
-    @Query(nativeQuery = true,value ="SELECT * FROM env_day where farm_id=?1 AND add_date=?2 ORDER BY add_date DESC LIMIT ?3")
-    List<EnvDayEntity> findByFarmIdAndAddDate(Integer farmId, Date todayDate,Integer days);
+    @Query(nativeQuery = true,value ="SELECT * FROM env_day where farm_id=?1 AND  DATE_FORMAT(add_date,'%Y-%m-%d')<=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY add_date DESC LIMIT ?3")
+    List<EnvDayEntity> findByFarmIdAndAddDate_0(Integer farmId, Date todayDate,Integer days);
+
+    @Query(nativeQuery = true,value ="SELECT * FROM env_day where farm_id=?1 ORDER BY add_date DESC LIMIT ?2")
+    List<EnvDayEntity> findByFarmIdAndAddDate(Integer farmId, Integer days);
 }

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

@@ -1,6 +1,6 @@
 package com.huimv.env.environ.service;
 
-import com.huimv.common.result.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 

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

@@ -3,8 +3,8 @@ package com.huimv.env.environ.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.common.result.Result;
-import com.huimv.common.result.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.environ.dao.entity.EnvDayEntity;
 import com.huimv.env.environ.dao.entity.EnvHourEntity;
 import com.huimv.env.environ.dao.repo.EnvDayRepo;
@@ -70,8 +70,11 @@ public class EnvironImpl implements IEnviron {
      */
     @Override
     public Result getLastSevenDayEnviron(Integer farmId,Integer days) throws ParseException {
+        System.out.println("dateUtil.getTodayDate()>>"+dateUtil.getTodayDate());
+        System.out.println("days>>"+days);
         //查询最近N天记录
-        List<EnvDayEntity> envDayEntityList = envDayRepo.findByFarmIdAndAddDate(farmId,dateUtil.getTodayDate(),days);
+        List<EnvDayEntity> envDayEntityList = envDayRepo.findByFarmIdAndAddDate(farmId,days);
+        System.out.println("envDayEntityList.size>>"+envDayEntityList.size());
         if(envDayEntityList.size()>0){
             JSONArray dateJa = new JSONArray();
             JSONArray codJa = new JSONArray();

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

@@ -1,6 +1,6 @@
 package com.huimv.env.environ.service;
 
-import com.huimv.common.result.Result;
+import com.huimv.common.utils.Result;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;