From d5cf76188ad37f062f37ebce3464097203b4db05 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 12 十月 2021 15:56:48 +0800
Subject: [PATCH] 去除电池状态-均充
---
src/main/java/com/whyc/controller/BatteryAlarmController.java | 71 +++++++++++------------------------
1 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BatteryAlarmController.java b/src/main/java/com/whyc/controller/BatteryAlarmController.java
index af85da2..60941ef 100644
--- a/src/main/java/com/whyc/controller/BatteryAlarmController.java
+++ b/src/main/java/com/whyc/controller/BatteryAlarmController.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;
@@ -18,78 +19,52 @@
*/
@RestController
@RequestMapping("batteryAlarm")
-@Api(tags = "鐢垫睜鍛婅")
+@Api(tags = "鐢垫睜鍛婅缁熻")
public class BatteryAlarmController {
@Autowired
private BatteryAlarmService service;
@GetMapping("monCapacity")
- @ApiOperation(notes = "", value = "鍗曚綋瀹归噺鍛婅浣庣粺璁�")
- public Response<Map> getMonCapacityLowAnalysis(HttpServletRequest request) {
- int userId = CommonUtil.getUser(request).getId();
-
+ @ApiOperation(value = "鍗曚綋瀹归噺鍛婅浣庣粺璁�")
+ public Response<Map> getMonCapacityLowAnalysis(@RequestParam Integer userId) {
return service.getMonCapacityLowAnalysis(userId);
}
-
- /**
- * 鍐呴樆娴嬭瘯鏁伴噺銆佹晠闅滄暟閲�
- *
- * @param request
- * @return
- */
- @GetMapping("onlineVol")
- @ApiOperation(notes = "", value = "鍦ㄧ嚎鐢靛帇鍜岀粍绔數鍘�")
- public Response<Map> getOnlineAndGroupVol(HttpServletRequest request) {
- int userId = CommonUtil.getUser(request).getId();
-
- return service.getOnlineAndGroupVol(userId);
+ @GetMapping("onlinegroupVolAnalysis")
+ @ApiOperation(value = "鍦ㄧ嚎鐢靛帇鍜岀粍绔數鍘嬪憡璀�")
+ public Response<Map> getOnlineAndGroupVolAnalysis(@RequestParam Integer userId) {
+ return service.getOnlineAndGroupVolAnalysis(userId);
}
-
- /**
- * BTS 璁惧鐘舵��
- *
- * @param request
- * @return
- */
@GetMapping("btsStatus")
- @ApiOperation(notes = "", value = "BTS璁惧鐘舵��")
- public Response<Map> getBTSEquipState(HttpServletRequest request) {
- int userId = CommonUtil.getUser(request).getId();
-
- return service.getDeviceStatus(userId);
+ @ApiOperation(value = "BTS璁惧鐘舵��")
+ public Response<Map> getBTSEquipStatus(@RequestParam Integer userId) {
+ return service.getBTSEquipStatus(userId);
}
- @GetMapping("discharge")
- @ApiOperation(notes = "", value = "鏀剧數鐢垫祦")
- public Response<Map> getDischargeState(HttpServletRequest request) {
- int userId = CommonUtil.getUser(request).getId();
-
- return service.getDischargeState(userId);
+ @GetMapping("dischargeAnalysis")
+ @ApiOperation(value = "鏀剧數鐢垫祦鍛婅")
+ public Response<Map> getDischargeAnalysis(@RequestParam Integer userId) {
+ return service.getDischargeAnalysis(userId);
}
- @GetMapping("charge")
- @ApiOperation(notes = "", value = "鏀剧數鍜� 鍏呯數鐢垫祦")
- public Response<Map> getCharge(HttpServletRequest request) {
- int userId = CommonUtil.getUser(request).getId();
-
- return service.getCharge(userId);
+ @GetMapping("chargeAnalysis")
+ @ApiOperation(value = "鏀剧數鍜屽厖鐢电數娴佸憡璀�")
+ public Response<Map> getChargeAnalysis(@RequestParam Integer userId) {
+ return service.getChargeAnalysis(userId);
}
- @GetMapping("monVRT")
- @ApiOperation(notes = "", value = "鍗曚綋鐢靛帇銆佸唴闃诲拰娓╁害鐘舵��")
- public Response<Map> getMonVRT(HttpServletRequest request) {
- int userId = CommonUtil.getUser(request).getId();
-
- return service.getMonVRT(userId);
+ @GetMapping("monVRTAnalysis")
+ @ApiOperation(value = "鍗曚綋鐢靛帇/鍐呴樆/娓╁害鍛婅")
+ public Response<Map> getMonVRTAnalysis(@RequestParam Integer userId) {
+ return service.getMonVRTAnalysis(userId);
}
--
Gitblit v1.9.1