lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/qxwarning/getFBStats：返回起止时间

master
ForwithyNew 2024-06-12 11:13:18 +08:00
parent 40e08831bf
commit 95a07d41b4
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/whdc/controller/QXWarnController.java
View File

@ -410,14 +410,19 @@ public class QXWarnController {
int minute = startCalendarDay.get(Calendar.MINUTE); int minute = startCalendarDay.get(Calendar.MINUTE);
int second = startCalendarDay.get(Calendar.SECOND); int second = startCalendarDay.get(Calendar.SECOND);
String nowTime = zerofill(year)+"-"+zerofill(month)+"-"+zerofill(day)+" "+ String nowTime = zerofill(year)+"-"+zerofill(month)+"-"+zerofill(day)+" "+
zerofill(hour)+":"+zerofill(minute)+":"+zerofill(second); "00"+":"+"08"+":"+"00";
System.out.println(nowTime); System.out.println(nowTime);
ArrayList<ApiDto.Filter> filter = Lists.newArrayList(); ArrayList<ApiDto.Filter> filter = Lists.newArrayList();
FBStatsVO fbStatsVO = null; FBStatsVO fbStatsVO = null;
//当前时间往前7天——本周预警统计 //当前时间往前7天——本周预警统计
int day_of_week = startCalendarDay.get(Calendar.DAY_OF_WEEK);
int weekminus = day_of_week == 0?7: day_of_week - 1;
Calendar weekStartDay = Calendar.getInstance(); Calendar weekStartDay = Calendar.getInstance();
weekStartDay.add(Calendar.DAY_OF_YEAR, 37*(-1)); weekStartDay.add(Calendar.DAY_OF_YEAR, (weekminus-1)*(-1));
String weekStartTime = CalendarDayStartToString(weekStartDay); String weekStartTime = CalendarDayStartToString2(weekStartDay);
// Calendar weekStartDay = Calendar.getInstance();
// weekStartDay.add(Calendar.DAY_OF_YEAR, 37*(-1));
// String weekStartTime = CalendarDayStartToString(weekStartDay);
System.out.println(weekStartTime); System.out.println(weekStartTime);
ApiDto weekDto = new ApiDto(); ApiDto weekDto = new ApiDto();
weekDto.setStartTime(weekStartTime); weekDto.setStartTime(weekStartTime);
@ -437,6 +442,8 @@ public class QXWarnController {
// System.out.println("周统计-："+warnList.getSumCount()+"个"); // System.out.println("周统计-："+warnList.getSumCount()+"个");
// } // }
fbStatsVO = getCount3(data); fbStatsVO = getCount3(data);
fbStatsVO.setStartTime(weekDto.getStartTime());//Date.from(LocalDateTime.parse(weekDto.getStartTime(), SECOND_FORMATTER).atZone(ZoneId.systemDefault()).toInstant())
fbStatsVO.setEndTime(weekDto.getEndTime());//Date.from(LocalDateTime.parse(weekDto.getEndTime(), SECOND_FORMATTER).atZone(ZoneId.systemDefault()).toInstant())
// System.out.println("周统计："+weekWarnNum +"个"); // System.out.println("周统计："+weekWarnNum +"个");
return ResultJson.ok(fbStatsVO); return ResultJson.ok(fbStatsVO);
} }
@ -455,6 +462,8 @@ public class QXWarnController {
if (searchjson != null && searchjson.getInteger("code") == HttpStatus.SC_OK) { if (searchjson != null && searchjson.getInteger("code") == HttpStatus.SC_OK) {
List<WarningData> data = searchjson.getJSONArray("data").toJavaList(WarningData.class); List<WarningData> data = searchjson.getJSONArray("data").toJavaList(WarningData.class);
fbStatsVO = getCount3(data); fbStatsVO = getCount3(data);
fbStatsVO.setStartTime(startTime);
fbStatsVO.setEndTime(endTime);
return ResultJson.ok(fbStatsVO); return ResultJson.ok(fbStatsVO);
} }
} }
@ -786,4 +795,14 @@ public class QXWarnController {
warnList = warnList.stream().filter(o -> "红色".equals(o.getWarnSignalLevel())||"橙色".equals(o.getWarnSignalLevel())).collect(Collectors.toList()); warnList = warnList.stream().filter(o -> "红色".equals(o.getWarnSignalLevel())||"橙色".equals(o.getWarnSignalLevel())).collect(Collectors.toList());
return warnList.size(); return warnList.size();
} }
static String CalendarDayStartToString2(Calendar calendarTime){
int year = calendarTime.get(Calendar.YEAR);
int month = calendarTime.get(Calendar.MONTH) + 1; //第一个月从0开始，所以得到月份＋1
int day = calendarTime.get(Calendar.DAY_OF_MONTH);
int hour = calendarTime.get(Calendar.HOUR_OF_DAY);
int minute = calendarTime.get(Calendar.MINUTE);
int second = calendarTime.get(Calendar.SECOND);
return zerofill(year)+"-"+zerofill(month)+"-"+zerofill(day)+" "+
"00"+":"+"08"+":"+"00";
}
} }

3
src/main/java/com/whdc/model/vo/FBStatsVO.java
View File

@ -2,6 +2,7 @@ package com.whdc.model.vo;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
@ -12,4 +13,6 @@ public class FBStatsVO {
private int callOrgSum;//叫应次数-暴雨黄色预警 private int callOrgSum;//叫应次数-暴雨黄色预警
private List<String> cnRedCallList;//叫应的县列表-暴雨红色预警 private List<String> cnRedCallList;//叫应的县列表-暴雨红色预警
private int callRedSum;//叫应次数-暴雨红色预警 private int callRedSum;//叫应次数-暴雨红色预警
private String startTime;//起始时间
private String endTime;//终止时间
} }