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/TdHygfJpInverterWarnMapper.xml

@@ -112,10 +112,10 @@
 				AND level = #{level}
 			</if>
 			<if test="minvalue != null and minvalue != ''">
-				AND time_long >= #{minvalue}
+				AND time_long >= (#{minvalue}*1000)
 			</if>
 			<if test="maxValue != null and maxValue != ''">
-				AND time_long <![CDATA[<=]]> #{maxValue}
+				AND time_long <![CDATA[<=]]> (#{maxValue}*1000)
 			</if>
 			<if test="snCode != null and snCode != ''">
 				AND sn_code like #{snCode}

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

@@ -404,7 +404,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             case"day":
                 LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
                 wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
-                wapper.eq(reviewDto.getTimeDate()!=null,DayGenerate::getDayTime,reviewDto.getTimeDate());
+                wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
                 count= dayGenerateMapper.selectCount(wapper);
                 List<DayGenerate> listday=   dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
                 list = getJpStationDtoday(  dataJpStation,   listday);
@@ -412,7 +412,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             case"month":
                 LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
                 wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
-                wapper1.eq(reviewDto.getTimeDate()!=null,MonthGenerate::getMonthTime,reviewDto.getTimeDate());
+                wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
                 count= monthGenerateMapper.selectCount(wapper1);
                 List<MonthGenerate> listmonth=   monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
 
@@ -421,7 +421,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             case"year":
                 LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
                 wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
-                wapper2.eq(reviewDto.getTimeDate()!=null,YearGenerate::getYear,reviewDto.getTimeDate());
+                wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());
                 count= yearGenerateMapper.selectCount(wapper2);
                 List<YearGenerate> listyear=   yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
 
@@ -592,7 +592,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     case "day":
                         LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
                         wapper.in(DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
-                        wapper.eq(reviewDto.getTimeDate() != null, DayGenerate::getDayTime, reviewDto.getTimeDate());
+                        wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate());
 
                         List<DayGenerate> listday = dayGenerateMapper.selectList(wapper);
                         List<DayGenerateEX> listne = getJpStationDtodaynew(dataJpStation, listday);
@@ -604,7 +604,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     case "month":
                         LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
                         wapper1.in(MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
-                        wapper1.eq(reviewDto.getTimeDate() != null, MonthGenerate::getMonthTime, reviewDto.getTimeDate());
+                        wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate());
 
                         List<MonthGenerate> listmonth = monthGenerateMapper.selectList(wapper1);
                         List<MonthGenerateEX> lo = getJpStationDtomonthnew(dataJpStation, listmonth);
@@ -616,7 +616,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     case "year":
                         LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
                         wapper2.in(YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
-                        wapper2.eq(reviewDto.getTimeDate() != null, YearGenerate::getYear, reviewDto.getTimeDate());
+                        wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate());
                         List<YearGenerate> listyear = yearGenerateMapper.selectList(wapper2);
                         List<YearGenerateEX> listy = getJpStationDtoyearnew(dataJpStation, listyear);
                         setResponseHeadForDowload(response, "电站年报表.xls");