From 25169ce9015c91b1596619fcc27b5554bd73bee7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 10:18:14 +0800
Subject: [PATCH] 5
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index 23bd4ef..2e76dad 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -1,8 +1,5 @@
package com.yssh.controller;
-import com.yssh.entity.Qxsh;
-import com.yssh.utils.CacheUtils;
-import com.yssh.utils.DateUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,10 +14,7 @@
import com.yssh.utils.Result;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.List;
-import java.util.Map;
@Api(tags = "鍛婅鍒嗘瀽")
@RequestMapping("/warning")
@@ -30,10 +24,6 @@
@Resource
private WarningAnalyseService warningService;
- /**
- * 1.鏌ヨ褰撳墠鏃堕棿鐨勬墍鏈夌偣浣峷alue鍊硷紙浠�47.dat鏌ヨ鍗冲彲锛�
- * 2.绛涢�夊ぇ浜巠ssh_bjyj涓殑jcbj瀛楁鐨勫�� 杩斿洖id+缁忕含搴�+value
- */
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鑾峰彇瀹炴椂鎶ヨ", notes = "鑾峰彇瀹炴椂鎶ヨ鍒嗘瀽鏁版嵁")
@GetMapping("/runAlarm")
@@ -41,10 +31,6 @@
return Result.OK(warningService.getRunTimeAlarmAnalyse());
}
- /**
- * 1.鏌ヨ褰撳墠鏃堕棿鐨勬墍鏈夌偣浣峷alue鍊硷紙浠�47.dat鏌ヨ鍗冲彲锛�
- * 2.绛涢�夊ぇ浜巠ssh_bjyj涓殑jcyj瀛楁鐨勫�� 杩斿洖id+缁忕含搴�+value
- */
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鑾峰彇瀹炴椂棰勮", notes = "鑾峰彇瀹炴椂棰勮鍒嗘瀽鏁版嵁")
@GetMapping("/runWarning")
@@ -53,10 +39,10 @@
}
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "鏈湀棰勮銆佹姤璀︾粺璁�", notes = "鏈湀棰勮銆佹姤璀︾粺璁★紝杩斿洖鍙傛暟alarmNumber瀵瑰簲鍊间负鏈湀鎶ヨ鏁版嵁閲忥紝鍙傛暟warningNumber瀵瑰簲鍊间负鏈湀棰勮鏁版嵁閲�")
+ @ApiOperation(value = "鏈湀棰勮鎶ヨ缁熻", notes = "鏈湀棰勮鎶ヨ缁熻锛岃繑鍥炲弬鏁癮larmNumber瀵瑰簲鍊间负鏈湀鎶ヨ鏁版嵁閲忥紝鍙傛暟warningNumber瀵瑰簲鍊间负鏈湀棰勮鏁版嵁閲�")
@GetMapping("/monthCount")
- public Result thisMonthCount() {
- return Result.OK(warningService.countThisMonthAlarmAndWarning());
+ public Result thisMonthCount(@RequestParam(value = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
+ return Result.OK(warningService.monthCount(null == date ? new Date() : date));
}
@ApiOperationSupport(order = 4)
@@ -91,9 +77,8 @@
if (null == begin || null == end) {
return Result.error(null);
}
-
if (begin.getTime() > end.getTime()) {
- Date tmp = end;
+ Date tmp = begin;
begin = end;
end = tmp;
}
--
Gitblit v1.9.3