From 659abe57f755e128e68d0a56bfc473e0baa4260b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 四月 2023 18:28:08 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index a225299..8360a42 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -4,8 +4,10 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -108,4 +110,23 @@
return Result.OK(list);
}
+
+ @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) {
+ if (null == begin || null == end) {
+ return Result.error(null);
+ }
+
+ if (begin.getTime() > end.getTime()) {
+ Date tmp = end;
+ begin = end;
+ end = tmp;
+ }
+
+ return Result.OK(warningService.getAlarmAndWarnByTime(begin, end));
+ }
}
--
Gitblit v1.9.3