Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/DayGenerateMapper.xml

@@ -57,7 +57,7 @@
         <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
-        and year = #{date}
+
         GROUP BY `year_time`
     </select>
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/config/TDengineServerConfig.java

@@ -74,7 +74,7 @@ public class TDengineServerConfig {
     @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        paginationInterceptor.setDialectType("TAOS-RS");
+        paginationInterceptor.setDialectType("mysql");
         return paginationInterceptor;
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

@@ -207,14 +207,14 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
             if(type.equals("month")){
                 map= getDayListOfMonth(reviewDto.getTimeDateMonth());
-                data= dayGenerateMapper.getDayGeneratqx(date, statioId);
+                data= dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(), statioId);
 
             }else if(type.equals("year")){
                 map= getyearListOfMonth(reviewDto.getTimeDateYear());
-                data= dayGenerateMapper.getMonthGenerateqx(date,statioId);
+                data= dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(),statioId);
             }else{
                 map= getyearList();
-                data= dayGenerateMapper.getYearGenerateqx(date, statioId);
+                data= dayGenerateMapper.getYearGenerateqx(null, statioId);
             }
 
             listx =map.get("x");