From d61a1d81e8dcaf8d0c8e0bd02e8914021aacb468 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 09:26:15 +0800
Subject: [PATCH] 3
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index b16c089..b165874 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -60,10 +60,11 @@
}
@ApiOperationSupport(order = 4)
- @ApiOperation(value = "姣忔棩棰勮銆佹姤璀︽暟閲忓彉鍖栬秼鍔�", notes = "涓�鍛ㄦ瘡鏃ラ璀︺�佹姤璀︽暟閲忕粺璁★紝杩斿洖鍙傛暟alarmDayCount涓轰竴鍛ㄦ瘡鏃ユ姤璀︾粺璁℃暟閲忓垪琛紝鍙傛暟warningDayCount涓轰竴鍛ㄦ瘡鏃ラ璀︾粺璁℃暟閲忓垪琛�")
+ @ApiOperation(value = "姣忔棩棰勮鎶ヨ鏁伴噺鍙樺寲瓒嬪娍", notes = "涓�鍛ㄦ瘡鏃ラ璀︺�佹姤璀︽暟閲忕粺璁★紝杩斿洖鍙傛暟alarmDayCount涓轰竴鍛ㄦ瘡鏃ユ姤璀︾粺璁℃暟閲忓垪琛紝鍙傛暟warningDayCount涓轰竴鍛ㄦ瘡鏃ラ璀︾粺璁℃暟閲忓垪琛�")
@GetMapping("/everydayCount")
- public Result everydayCount() {
- return Result.OK(warningService.countEverydayAlarmAndWarning());
+ 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));
}
@ApiOperationSupport(order = 4)
@@ -71,7 +72,6 @@
@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));
}
--
Gitblit v1.9.3