From b5209278c6bd519a52f5ae6b1c4d61d99e907f6d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 19 三月 2021 15:16:23 +0800
Subject: [PATCH] 更新电源状态告警
---
src/main/java/com/whyc/controller/PowerAlarmController.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PowerAlarmController.java b/src/main/java/com/whyc/controller/PowerAlarmController.java
index c271844..d52524a 100644
--- a/src/main/java/com/whyc/controller/PowerAlarmController.java
+++ b/src/main/java/com/whyc/controller/PowerAlarmController.java
@@ -8,6 +8,7 @@
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
@@ -27,16 +28,14 @@
@GetMapping("acInput")
@ApiOperation(value = "浜ゆ祦杈撳叆")
- public Response<Map> getACInputAnalysis(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ public Response<Map> getACInputAnalysis(@RequestParam Integer userId){
Response<Map> response = service.getACInputAnalysis(userId);
return response;
}
@GetMapping("error")
@ApiOperation(value = "鏁呴殰")
- public Response<Map> getErrorAnalysis(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ public Response<Map> getErrorAnalysis(@RequestParam Integer userId){
Response<Map> response = service.getErrorAnalysis(userId);
return response;
}
@@ -47,40 +46,35 @@
*/
@GetMapping("acABC")
@ApiOperation(value = "浜ゆ祦ABC")
- public Response<Map> getAcABCAnalysis(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ public Response<Map> getAcABCAnalysis(@RequestParam Integer userId){
Response<Map> response = service.getAcABCAnalysis(userId);
return response;
}
@GetMapping("rectifier")
@ApiOperation(value = "鏁存祦鍣�")
- public Response<Map> getRectifierAnalysis(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ public Response<Map> getRectifierAnalysis(@RequestParam Integer userId){
Response<Map> response = service.getRectifierAnalysis(userId);
return response;
}
@GetMapping("status")
- @ApiOperation(value = "鐢垫簮鐘舵��")
- public Response<Map> getStatus(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ @ApiOperation(value = "鐢垫簮鐘舵�佸憡璀�")
+ public Response<Map> getStatus(@RequestParam Integer userId){
Response<Map> response = service.getStatus(userId);
return response;
}
@GetMapping("batteryGroup")
@ApiOperation(value = "鐢垫睜缁�")
- public Response<Map> getBatteryGroupAnalysis(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ public Response<Map> getBatteryGroupAnalysis(@RequestParam Integer userId){
Response<Map> response = service.getBatteryGroupAnalysis(userId);
return response;
}
@GetMapping("stationCount")
@ApiOperation(value = "鏁呴殰鏈烘埧鏁伴噺")
- public Response<List> getAlarmStationCount(HttpServletRequest request){
- int userId = CommonUtil.getUser(request).getId();
+ public Response<List> getAlarmStationCount(@RequestParam Integer userId){
Response<List> response = service.getAlarmStationCount(userId);
return response;
}
--
Gitblit v1.9.1