From 4b4a150626f7943ee0811d7c3c718be0abe68b23 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 10:41:41 +0800
Subject: [PATCH] 6
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index 2e76dad..095929a 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -27,15 +27,15 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鑾峰彇瀹炴椂鎶ヨ", notes = "鑾峰彇瀹炴椂鎶ヨ鍒嗘瀽鏁版嵁")
@GetMapping("/runAlarm")
- public Result alarmAnalyse() {
- return Result.OK(warningService.getRunTimeAlarmAnalyse());
+ public Result alarmAnalyse(@RequestParam(value = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ return Result.OK(warningService.getRunTimeAlarmAnalyse(null == date ? new Date() : date));
}
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鑾峰彇瀹炴椂棰勮", notes = "鑾峰彇瀹炴椂棰勮鍒嗘瀽鏁版嵁")
@GetMapping("/runWarning")
- public Result warningAnalyse() {
- return Result.OK(warningService.getRunTimeWarningAnalyse());
+ public Result warningAnalyse(@RequestParam(value = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ return Result.OK(warningService.getRunTimeWarningAnalyse(null == date ? new Date() : date));
}
@ApiOperationSupport(order = 3)
@@ -49,23 +49,21 @@
@ApiOperation(value = "涓�鍛ㄩ璀︽姤璀︽暟閲忓彉鍖栬秼鍔�", notes = "涓�鍛ㄩ璀︽姤璀︽暟閲忓彉鍖栬秼鍔匡紝杩斿洖鍙傛暟alarmDayCount涓轰竴鍛ㄦ瘡鏃ユ姤璀︾粺璁℃暟閲忓垪琛紝鍙傛暟warningDayCount涓轰竴鍛ㄦ瘡鏃ラ璀︾粺璁℃暟閲忓垪琛�")
@GetMapping("/everydayCount")
public Result everydayCount(@RequestParam(value = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
- Date endDate = null == date ? new Date() : date;
- return Result.OK(warningService.everydayCount(endDate));
+ return Result.OK(warningService.everydayCount(null == date ? new Date() : date));
}
@ApiOperationSupport(order = 4)
@ApiOperation(value = "涓夊皬鏃剁洃娴嬬珯鐐规暟鎹彉鍖栬秼鍔�", notes = "杩斿洖鍊间负涓夊皬鏃剁洃娴嬬珯鐐圭洃娴嬫暟鎹紝杩斿洖鍊间负map闆嗗悎锛屽叾涓璳ey涓虹珯鐐瑰悕绉帮紝value涓簂ist闆嗗悎锛屼繚瀛樻瘡澶╃洃娴嬫暟鍊兼暟鎹�")
@GetMapping("/locationDataChange")
public Result locationDataChange(@RequestParam(value = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
- Date endDate = null == date ? new Date() : date;
- return Result.OK(warningService.select3Hours(endDate));
+ return Result.OK(warningService.select3Hours(null == date ? new Date() : date));
}
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10", notes = "鑾峰彇鏈湀鐩戞祴澶ф暟鎹珯鐐规渶澶у�糡OP10鏁伴噺鍒楄〃")
@GetMapping("/monthTop10")
public Result monthTop10() {
- return Result.ok(warningService.selectMonthTop10());
+ return Result.OK(warningService.selectMonthTop10());
}
@ApiOperationSupport(order = 5)
--
Gitblit v1.9.3