将列表开始时间00:15改为00:00

ipp-idp/src/main/java/com/jiayue/ipp/idp/controller/ForecastReportController.java

@@ -52,8 +52,8 @@ public class ForecastReportController {
     @ApiOperation(value = "通过条件查询", notes = "通过条件查询")
     @GetMapping("/queryReport")
     public R queryReport(Long ycDate,Long cdqDate,Long sjDate,Long agcDate) throws Exception {
-        Date ycStartTime = new Date(ycDate+1000*60*15);
-        Date ycEndTime = new Date(ycDate+1000*60*1440);
+        Date ycStartTime = new Date(ycDate);
+        Date ycEndTime = new Date(ycDate+1000*60*1440-1000*60*15);
         // 获取场站短期实时
         QueryWrapper<ForecastPowerShortTerm> queryWrapper = new QueryWrapper<>();
         queryWrapper.between("forecast_time", ycStartTime, ycEndTime);
@@ -69,8 +69,8 @@ public class ForecastReportController {
         Map<String, List<Nwp>> nwpListByStationCodeMap = nwpList.stream().collect(Collectors.groupingBy(r -> r.getStationCode()));
 
         // 获取场站超短期实时
-        Date cdqStartTime = new Date(cdqDate+1000*60*15);
-        Date cdqEndTime = new Date(cdqDate+1000*60*1440);
+        Date cdqStartTime = new Date(cdqDate);
+        Date cdqEndTime = new Date(cdqDate+1000*60*1440-1000*60*15);
         QueryWrapper<ForecastPowerUltraShortTerm> cdqWrapper = new QueryWrapper<>();
         cdqWrapper.between("forecast_time", cdqStartTime, cdqEndTime);
         List<ForecastPowerUltraShortTerm> cdqList = forecastPowerUltraShortTermService.list(cdqWrapper);
@@ -78,8 +78,8 @@ public class ForecastReportController {
         Map<String, List<ForecastPowerUltraShortTerm>> cdqListByStationCodeMap = cdqList.stream().collect(Collectors.groupingBy(r -> r.getStationCode()));
 
         // 获取场站实际功率
-        Date sjStartTime = new Date(sjDate+1000*60*15);
-        Date sjEndTime = new Date(sjDate+1000*60*1440);
+        Date sjStartTime = new Date(sjDate);
+        Date sjEndTime = new Date(sjDate+1000*60*1440-1000*60*15);
         QueryWrapper<PowerStationStatusData> sjWrapper = new QueryWrapper<>();
         sjWrapper.between("time", sjStartTime, sjEndTime);
         List<PowerStationStatusData> sjList = powerStationStatusDataService.list(sjWrapper);
@@ -87,8 +87,8 @@ public class ForecastReportController {
         Map<String, List<PowerStationStatusData>> sjListByStationCodeMap = sjList.stream().collect(Collectors.groupingBy(r -> r.getStationCode()));
 
         // 获取agc
-        Date agcStartTime = new Date(agcDate+1000*60*15);
-        Date agcEndTime = new Date(agcDate+1000*60*1440);
+        Date agcStartTime = new Date(agcDate);
+        Date agcEndTime = new Date(agcDate+1000*60*1440-1000*60*15);
         QueryWrapper<GridApCommandValue> agcWrapper = new QueryWrapper<>();
         agcWrapper.between("time", agcStartTime, agcEndTime);
         List<GridApCommandValue> agcList = gridApCommandValueService.list(agcWrapper);
@@ -168,12 +168,7 @@ public class ForecastReportController {
             for (Long tempTime = ycStartTime.getTime(); tempTime <= ycEndTime.getTime(); tempTime = tempTime + momentTime) {
                 ForecastReportDto forecastReportDto = new ForecastReportDto();
                 String timeStr = DateUtil.format(new Date(tempTime),"HH:mm");
-                if (timeStr.equals("00:00")){
-                    forecastReportDto.setTime("24:00");
-                }
-                else{
-                    forecastReportDto.setTime(timeStr);
-                }
+                forecastReportDto.setTime(timeStr);
                 // 短期
                 if (stListByTimeMap.get(timeStr)!=null){
                     ForecastPowerShortTerm forecastPowerShortTerm = stListByTimeMap.get(timeStr);
@@ -260,8 +255,8 @@ public class ForecastReportController {
 
         try (Workbook workbook = new XSSFWorkbook();ServletOutputStream out = response.getOutputStream()){
             response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
-            Date ycStartTime = new Date(ycDate+1000*60*15);
-            Date ycEndTime = new Date(ycDate+1000*60*1440);
+            Date ycStartTime = new Date(ycDate);
+            Date ycEndTime = new Date(ycDate+1000*60*1440-1000*60*15);
             // 获取场站短期实时
             QueryWrapper<ForecastPowerShortTerm> queryWrapper = new QueryWrapper<>();
             queryWrapper.between("forecast_time", ycStartTime, ycEndTime);
@@ -277,8 +272,8 @@ public class ForecastReportController {
             Map<String, List<Nwp>> nwpListByStationCodeMap = nwpList.stream().collect(Collectors.groupingBy(r -> r.getStationCode()));
 
             // 获取场站超短期实时
-            Date cdqStartTime = new Date(cdqDate+1000*60*15);
-            Date cdqEndTime = new Date(cdqDate+1000*60*1440);
+            Date cdqStartTime = new Date(cdqDate);
+            Date cdqEndTime = new Date(cdqDate+1000*60*1440-1000*60*15);
             QueryWrapper<ForecastPowerUltraShortTerm> cdqWrapper = new QueryWrapper<>();
             cdqWrapper.between("forecast_time", cdqStartTime, cdqEndTime);
             List<ForecastPowerUltraShortTerm> cdqList = forecastPowerUltraShortTermService.list(cdqWrapper);
@@ -286,8 +281,8 @@ public class ForecastReportController {
             Map<String, List<ForecastPowerUltraShortTerm>> cdqListByStationCodeMap = cdqList.stream().collect(Collectors.groupingBy(r -> r.getStationCode()));
 
             // 获取场站实际功率
-            Date sjStartTime = new Date(sjDate+1000*60*15);
-            Date sjEndTime = new Date(sjDate+1000*60*1440);
+            Date sjStartTime = new Date(sjDate);
+            Date sjEndTime = new Date(sjDate+1000*60*1440-1000*60*15);
             QueryWrapper<PowerStationStatusData> sjWrapper = new QueryWrapper<>();
             sjWrapper.between("time", sjStartTime, sjEndTime);
             List<PowerStationStatusData> sjList = powerStationStatusDataService.list(sjWrapper);
@@ -295,8 +290,8 @@ public class ForecastReportController {
             Map<String, List<PowerStationStatusData>> sjListByStationCodeMap = sjList.stream().collect(Collectors.groupingBy(r -> r.getStationCode()));
 
             // 获取agc
-            Date agcStartTime = new Date(agcDate+1000*60*15);
-            Date agcEndTime = new Date(agcDate+1000*60*1440);
+            Date agcStartTime = new Date(agcDate);
+            Date agcEndTime = new Date(agcDate+1000*60*1440-1000*60*15);
             QueryWrapper<GridApCommandValue> agcWrapper = new QueryWrapper<>();
             agcWrapper.between("time", agcStartTime, agcEndTime);
             List<GridApCommandValue> agcList = gridApCommandValueService.list(agcWrapper);
@@ -392,12 +387,7 @@ public class ForecastReportController {
                 for (Long tempTime = ycStartTime.getTime(); tempTime <= ycEndTime.getTime(); tempTime = tempTime + momentTime) {
                     ForecastReportDto forecastReportDto = new ForecastReportDto();
                     String timeStr = DateUtil.format(new Date(tempTime),"HH:mm");
-                    if (timeStr.equals("00:00")){
-                        forecastReportDto.setTime("24:00");
-                    }
-                    else{
-                        forecastReportDto.setTime(timeStr);
-                    }
+                    forecastReportDto.setTime(timeStr);
                     // 短期
                     if (stListByTimeMap.get(timeStr)!=null){
                         ForecastPowerShortTerm forecastPowerShortTerm = stListByTimeMap.get(timeStr);

ipp-idp/src/main/java/com/jiayue/ipp/idp/controller/UltraForecast16Controller.java

@@ -45,8 +45,8 @@ public class UltraForecast16Controller {
     @GetMapping("/queryReport")
     public R queryReport(Long cdqDate) throws Exception {
         // 获取场站超短期实时
-        Date cdqStartTime = new Date(cdqDate+1000*60*15);
-        Date cdqEndTime = new Date(cdqDate+1000*60*1440);
+        Date cdqStartTime = new Date(cdqDate);
+        Date cdqEndTime = new Date(cdqDate+1000*60*1440-1000*60*15);
         QueryWrapper<ForecastPowerUltraShortTermHis> cdqWrapper = new QueryWrapper<>();
         cdqWrapper.between("forecast_time", cdqStartTime, cdqEndTime);
         List<ForecastPowerUltraShortTermHis> cdqList = forecastPowerUltraShortTermHisService.list(cdqWrapper);
@@ -95,12 +95,7 @@ public class UltraForecast16Controller {
         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
         for (long i = startTime; i <= cdqEndTime.getTime(); i = i + 900000L) {
             String timeStr = sdf.format(new Date(i));
-            if (timeStr.equals("00:00")){
-                times.add("24:00");
-            }
-            else{
-                times.add(timeStr);
-            }
+            times.add(timeStr);
         }
         resultMap.put("times",times);
         resultMap.put("dataMap",dataMap);
@@ -120,8 +115,8 @@ public class UltraForecast16Controller {
             response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
 
             // 获取场站超短期实时
-            Date cdqStartTime = new Date(cdqDate+1000*60*15);
-            Date cdqEndTime = new Date(cdqDate+1000*60*1440);
+            Date cdqStartTime = new Date(cdqDate);
+            Date cdqEndTime = new Date(cdqDate+1000*60*1440-1000*60*15);
             QueryWrapper<ForecastPowerUltraShortTermHis> cdqWrapper = new QueryWrapper<>();
             cdqWrapper.between("forecast_time", cdqStartTime, cdqEndTime);
             List<ForecastPowerUltraShortTermHis> cdqList = forecastPowerUltraShortTermHisService.list(cdqWrapper);
@@ -203,12 +198,7 @@ public class UltraForecast16Controller {
                 SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
                 for (long i = startTime; i <= cdqEndTime.getTime(); i = i + 900000L) {
                     String timeStr = sdf.format(new Date(i));
-                    if (timeStr.equals("00:00")){
-                        times.add("24:00");
-                    }
-                    else{
-                        times.add(timeStr);
-                    }
+                    times.add(timeStr);
                 }
 
                 for (int k=0;k<96;k++){