diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index 7682a2c..8fba5a0 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -6,7 +6,6 @@ import com.google.common.collect.Sets; import com.whdc.model.dto.ApiDto; import com.whdc.model.dto.GroupWarningDto; import com.whdc.model.dto.WarnDppleDto; -import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.AddressBookOld; import com.whdc.model.entity.QXWarning; import com.whdc.model.entity.WarnMsgFB; @@ -344,7 +343,7 @@ public class QXWarnController { @ApiOperation(value = "历史气象预警查询") @PostMapping("/getHistoryWarning") @Cacheable(value = THIS_REDIS_KEY, key = "#root.method.name+':'+#dto.toString()") - public ResultJson getHistoryWarning(@RequestBody GroupWarningDto dto) { + public ResultJson getHistoryWarning(@RequestBody GroupWarningDto dto) { List warnList = new ArrayList<>(); HistoryWarnsVO historyWarnsVO = new HistoryWarnsVO(); ApiDto apiDto = new ApiDto(); @@ -383,7 +382,7 @@ public class QXWarnController { qxWarningList = getPageWarning(data, pageNumber, pageSize); } historyWarnsVO.setWarnList(qxWarningList); - return ResultJson.ok(qxWarningList); + return ResultJson.ok(historyWarnsVO); } return ResultJson.ok("");