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

/getHistoryWarning:历史气象预警，支持时间查询了。

master
ForwithyNew 2024-06-11 14:18:27 +08:00
parent bcfacb94ed
commit 82e0eddbd0
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,10 +307,10 @@ public class QXWarnController {
@Cacheable(value = THIS_REDIS_KEY, key = "#root.method.name+':'+#dto.toString()") @Cacheable(value = THIS_REDIS_KEY, key = "#root.method.name+':'+#dto.toString()")
public ResultJson<QXWarningVO> getHistoryGroupWarning(@RequestBody GroupWarningDto dto) { public ResultJson<QXWarningVO> getHistoryGroupWarning(@RequestBody GroupWarningDto dto) {
List<QXWarningVO> warnList = new ArrayList<>(); List<QXWarningVO> warnList = new ArrayList<>();
HistoryWarnsVO historyWarnsVO = new HistoryWarnsVO();
ApiDto apiDto = new ApiDto(); ApiDto apiDto = new ApiDto();
// apiDto.setStartTime(dto.getStartTime());//一年的起始时间 apiDto.setStartTime(dto.getStartTime());//一年的起始时间
// apiDto.setEndTime(dto.getEndTime());//当前时间 apiDto.setEndTime(dto.getEndTime());//当前时间
apiDto.setPageNumber(dto.getPageNumber());//第几页 apiDto.setPageNumber(dto.getPageNumber());//第几页
apiDto.setPageSize(dto.getPageSize());//一页10个 apiDto.setPageSize(dto.getPageSize());//一页10个
ArrayList<ApiDto.Filter> filter = Lists.newArrayList(); ArrayList<ApiDto.Filter> filter = Lists.newArrayList();
@ -318,27 +318,6 @@ public class QXWarnController {
int pageNumber = dto.getPageNumber(); int pageNumber = dto.getPageNumber();
int pageSize = dto.getPageSize(); int pageSize = dto.getPageSize();
//当前时间
Calendar startCalendarDay = Calendar.getInstance();
int year = startCalendarDay.get(Calendar.YEAR);
int month = startCalendarDay.get(Calendar.MONTH) + 1; //第一个月从0开始，所以得到月份＋1
int day = startCalendarDay.get(Calendar.DAY_OF_MONTH);
int hour = startCalendarDay.get(Calendar.HOUR_OF_DAY);
int minute = startCalendarDay.get(Calendar.MINUTE);
int second = startCalendarDay.get(Calendar.SECOND);
String nowTime = zerofill(year)+"-"+zerofill(month)+"-"+zerofill(day)+" "+
zerofill(hour)+":"+zerofill(minute)+":"+zerofill(second);
System.out.println(nowTime);
apiDto.setEndTime(nowTime);//当前时间
int day_of_year = startCalendarDay.get(Calendar.DAY_OF_YEAR);
Calendar yearStartDay = Calendar.getInstance();
int yeardayminus = day_of_year - 1;
yearStartDay.add(Calendar.DAY_OF_YEAR, yeardayminus*(-1));
String yearStartTime = CalendarDayStartToString(yearStartDay);
System.out.println(yearStartTime);
apiDto.setStartTime(yearStartTime);//一年的起始时间
String publishUnit = dto.getPublishUnit(); String publishUnit = dto.getPublishUnit();
String warnSignalLevel = dto.getWarnSignalLevel(); String warnSignalLevel = dto.getWarnSignalLevel();
String warnSignalType = dto.getWarnSignalType(); String warnSignalType = dto.getWarnSignalType();
@ -351,6 +330,7 @@ public class QXWarnController {
int count = getCount2(data); int count = getCount2(data);
System.out.println("历史预警数量："+data.size()); System.out.println("历史预警数量："+data.size());
System.out.println("历史预警数量2："+count); System.out.println("历史预警数量2："+count);
historyWarnsVO.setCount(count);
//查找最近10条数据,放到warnList属性上 //查找最近10条数据,放到warnList属性上
List<QXWarningVO> qxWarningList = null; List<QXWarningVO> qxWarningList = null;
//getLatestTen(data); //getLatestTen(data);
@ -363,6 +343,7 @@ public class QXWarnController {
System.out.println("pageSize:"+pageSize); System.out.println("pageSize:"+pageSize);
qxWarningList = getPageWarning(data, pageNumber, pageSize); qxWarningList = getPageWarning(data, pageNumber, pageSize);
} }
historyWarnsVO.setWarnList(qxWarningList);
return ResultJson.ok(qxWarningList); return ResultJson.ok(qxWarningList);
} }

11
src/main/java/com/whdc/model/vo/HistoryWarnsVO.java Normal file
View File

@ -0,0 +1,11 @@
package com.whdc.model.vo;
import lombok.Data;
import java.util.List;
@Data
public class HistoryWarnsVO {
private int count;
List<QXWarningVO> warnList;
}