From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/InterFaceController.java | 130 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterFaceController.java b/src/main/java/com/whyc/controller/InterFaceController.java
index 0b7d27e..62f4695 100644
--- a/src/main/java/com/whyc/controller/InterFaceController.java
+++ b/src/main/java/com/whyc/controller/InterFaceController.java
@@ -1,15 +1,16 @@
package com.whyc.controller;
+import com.whyc.dto.InterfaceParam;
import com.whyc.dto.Response;
+import com.whyc.pojo.BattRealdata;
+import com.whyc.pojo.Fbs9100Setparam;
import com.whyc.service.InterfaceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-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 org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
@RequestMapping("interface")
@RestController
@@ -19,32 +20,127 @@
private InterfaceService service;
@GetMapping("/getBattInf")
@ApiOperation("鑾峰彇鎵�鏈夌數姹犱俊鎭�")
- public Response getBattinf(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getBattinf(pageNum,pageSize);
+ public Response getBattinf(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam String interfaceNumber) {
+ return service.getBattinf(pageNum, pageSize, interfaceNumber);
}
@GetMapping("/getPowerInf")
@ApiOperation("鑾峰彇鎵�鏈夌數婧愪俊鎭�")
- public Response getPowerInf(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getPowerInf(pageNum,pageSize);
+ public Response getPowerInf(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam String interfaceNumber) {
+ return service.getPowerInf(pageNum, pageSize, interfaceNumber);
}
- @GetMapping("/getBattAlarm")
+ @PostMapping("/getBattAlarm")
@ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁")
- public Response getBattAlarm(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getBattAlarm(pageNum,pageSize);
+ public Response getBattAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
+ return service.getBattAlarm(interfaceParam.getBattgroupIds(), interfaceNumber, null);
}
- @GetMapping("/getDevAlarm")
+ @PostMapping("/getDevAlarm")
@ApiOperation("鑾峰彇璁惧鍛婅鏁版嵁")
- public Response getDevAlarm(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getDevAlarm(pageNum,pageSize);
+ public Response getDevAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
+ return service.getDevAlarm(interfaceParam.getDeviceIds(), interfaceNumber);
}
- @GetMapping("/getPowerAlarm")
+ @PostMapping("/getPowerAlarm")
@ApiOperation("鑾峰彇鐢垫簮鍛婅鏁版嵁")
- public Response getPowerAlarm(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getPwrdevAlarm(pageNum,pageSize);
+ public Response getPowerAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
+ return service.getPwrdevAlarm(interfaceParam.getPowerDeviceIds(), interfaceNumber);
}
+ @PostMapping("getRealTimeAlarm")
+ @ApiOperation("鑾峰彇瀹炴椂鍛婅鏁版嵁")
+ public Response getRealTimeAlarm(@RequestBody InterfaceParam interfaceParam) {
+ return service.getRealTimeAlarm(interfaceParam);
+ }
+
+
+ @PostMapping("/getBattAlarmHistory")
+ @ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁鍘嗗彶")
+ public Response getBattAlarmHistory(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) {
+ return service.getBattAlarmHistory(interfaceParam.getBattgroupIds(), interfaceNumber,pageNum,pageSize);
+ }
+
+ @PostMapping("/getBattAlarmHistory2")
+ @ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁鍘嗗彶-甯︽椂闂寸瓫閫夊拰瀛樺湪鍒嗚〃")
+ public Response getBattAlarmHistory2(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) throws ParseException {
+ return service.getBattAlarmHistory2(interfaceParam, interfaceNumber,pageNum,pageSize);
+ }
+
+ @PostMapping("/getDevAlarmHistory")
+ @ApiOperation("鑾峰彇璁惧鍛婅鏁版嵁鍘嗗彶")
+ public Response getDevAlarmHistory(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) {
+ return service.getDevAlarmHistory(interfaceParam.getDeviceIds(), interfaceNumber,pageNum,pageSize);
+ }
+
+ @PostMapping("/getDevAlarmHistory2")
+ @ApiOperation("鑾峰彇璁惧鍛婅鏁版嵁鍘嗗彶-甯︽椂闂寸瓫閫夊拰瀛樺湪鍒嗚〃")
+ public Response getDevAlarmHistory2(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) throws ParseException {
+ return service.getDevAlarmHistory2(interfaceParam, interfaceNumber,pageNum,pageSize);
+ }
+
+ @PostMapping("/getPowerAlarmHistory")
+ @ApiOperation("鑾峰彇鐢垫簮鍛婅鏁版嵁鍘嗗彶")
+ public Response getPowerAlarmHistory(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) {
+ return service.getPwrdevAlarmHistory(interfaceParam.getPowerDeviceIds(), interfaceNumber,pageNum,pageSize);
+ }
+
+ @PostMapping("/getRealtime")
+ @ApiOperation("鑾峰彇瀹炴椂鐘舵�佷俊鎭�")
+ public Response getRealtime(@RequestBody InterfaceParam interfaceParam) {
+ return service.getRealTime(interfaceParam);
+ }
+
+ @GetMapping("/getInterface")
+ @ApiOperation("鑾峰彇鎵�鏈夌涓夋柟鐮佺殑淇℃伅")
+ public Response getInterface(@RequestParam int pageNum, @RequestParam int pageSize) {
+ return service.getInterface(pageNum, pageSize);
+ }
+
+ @GetMapping("/createInterface")
+ @ApiOperation("鐢熸垚绗笁鏂归獙璇佺爜")
+ public Response createInterface(@RequestParam String interfaceName) {
+ return service.createInterface(interfaceName);
+ }
+
+ @GetMapping("/updateInterface")
+ @ApiOperation("缂栬緫绗笁鏂归獙璇佺爜鏄惁鍙敤")
+ public Response updateInterface(@RequestParam int num, @RequestParam int enable) {
+ return service.updateInterface(num, enable);
+ }
+
+ @GetMapping("getBattStationInfoByStationId")
+ @ApiOperation("鑾峰彇鐢垫睜鏈烘埧淇℃伅")
+ public Response getBattStationInfoByStationId(@RequestParam String stationId,@RequestParam String interfaceNumber){
+ return service.getBattStationInfoByStationId(stationId,interfaceNumber);
+ }
+
+ /**
+ * 鏍稿鏀剧數:
+ * 鑾峰彇鍙傛暟: 鈶爏endCmdGet
+ * 璁剧疆鍙傛暟: 鈶endCmdSet
+ * 鍚姩: 鈶爏endCmdGet
+ * 鍋滄: 鈶爏endCmdGet
+ *
+ * 鍐呴樆娴嬭瘯:
+ * 鍚姩: 鈶爏endCmdGet
+ * 鍋滄: 鈶爏endCmdGet
+ */
+ @ApiOperation("鍙戦�佹寚浠�,鑾峰彇鍙傛暟(鍚姩|鍋滄|鑾峰彇鍙傛暟)")
+ @GetMapping("sendCmdGet")
+ public Response sendCmdGet(@RequestParam int opCmd,@RequestParam Integer testCmd,@RequestParam int devId,@RequestParam int battGroupNum,@RequestParam String interfaceNumber){
+ return service.sendCmdGet(opCmd,testCmd,devId,battGroupNum,interfaceNumber);
+ }
+
+ @ApiOperation("鍙戦�佹寚浠�,璁剧疆鍙傛暟")
+ @PostMapping("sendCmdSet")
+ public Response sendCmdSet(@RequestBody Fbs9100Setparam param,@RequestParam String interfaceNumber){
+ return service.sendCmdSet(param,interfaceNumber);
+ }
+
+ @PostMapping("/getBattHistoryDataList")
+ @ApiOperation("鑾峰彇鐢垫睜鍘嗗彶瀹炴椂鏁版嵁")
+ public Response getBattHistoryDataList(@RequestBody BattRealdata data, @RequestParam String interfaceNumber) throws ParseException, InterruptedException {
+ return service.getBattHistoryDataList(data, interfaceNumber);
+ }
}
--
Gitblit v1.9.1