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

1928修改

master
徐杰盟 2024-06-13 09:25:12 +08:00
parent a297c11bcd
commit 23c0238a6d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import com.google.common.collect.Sets;
import com.whdc.model.dto.ApiDto; import com.whdc.model.dto.ApiDto;
import com.whdc.model.dto.GroupWarningDto; import com.whdc.model.dto.GroupWarningDto;
import com.whdc.model.dto.WarnDppleDto; import com.whdc.model.dto.WarnDppleDto;
import com.whdc.model.entity.AddressBook;
import com.whdc.model.entity.AddressBookOld; import com.whdc.model.entity.AddressBookOld;
import com.whdc.model.entity.QXWarning; import com.whdc.model.entity.QXWarning;
import com.whdc.model.entity.WarnMsgFB; import com.whdc.model.entity.WarnMsgFB;
@ -344,7 +343,7 @@ public class QXWarnController {
@ApiOperation(value = "历史气象预警查询") @ApiOperation(value = "历史气象预警查询")
@PostMapping("/getHistoryWarning") @PostMapping("/getHistoryWarning")
@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> getHistoryWarning(@RequestBody GroupWarningDto dto) { public ResultJson<HistoryWarnsVO> getHistoryWarning(@RequestBody GroupWarningDto dto) {
List<QXWarningVO> warnList = new ArrayList<>(); List<QXWarningVO> warnList = new ArrayList<>();
HistoryWarnsVO historyWarnsVO = new HistoryWarnsVO(); HistoryWarnsVO historyWarnsVO = new HistoryWarnsVO();
ApiDto apiDto = new ApiDto(); ApiDto apiDto = new ApiDto();
@ -383,7 +382,7 @@ public class QXWarnController {
qxWarningList = getPageWarning(data, pageNumber, pageSize); qxWarningList = getPageWarning(data, pageNumber, pageSize);
} }
historyWarnsVO.setWarnList(qxWarningList); historyWarnsVO.setWarnList(qxWarningList);
return ResultJson.ok(qxWarningList); return ResultJson.ok(historyWarnsVO);
} }
return ResultJson.ok(""); return ResultJson.ok("");