From 59478e6b937532b9051bd07400159786d1b8d2ea Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 28 七月 2023 20:47:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index eecb6f7..87fd2bb 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -93,31 +93,15 @@
@ApiOperation(value = "鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10", notes = "鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10鏁伴噺鍒楄〃")
@GetMapping("/monthTop10")
public Result monthTop10() {
- //return Result.OK(warningService.selectThisMonthLocationValueDataTop10());
-
- //String key = dateFormat.format(new Date()) + "_top10";
- //Object obj = CacheUtils.get(key);
- List<Qxsh> list;
-
- //if (null != obj) {
- // list = (List<Qxsh>) obj;
- //} else {
- //list = warningService.selectThisMonthLocationValueDataTop10();
- list = warningService.selectMonthTop10();
- // if (null != list && list.size() > 0) {
- // CacheUtils.put(key, list);
- // }
- //}
-
- return Result.ok(list);
+ return Result.ok(warningService.selectMonthTop10());
}
@ApiOperationSupport(order = 5)
@ApiOperation(value = "鏍规嵁鏃堕棿鑾峰彇鎶ヨ鍜岄璀︿俊鎭�", notes = "鏍规嵁鏃堕棿鑾峰彇鎶ヨ鍜岄璀︿俊鎭�")
@GetMapping("/getAlarmAndWarnByTime")
public Result getAlarmAndWarnByTime(
- @RequestParam(value = "begin", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date begin,
- @RequestParam(value = "end", required = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
+ @RequestParam(value = "begin") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date begin,
+ @RequestParam(value = "end") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date end) {
if (null == begin || null == end) {
return Result.error(null);
}
--
Gitblit v1.9.3