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 | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterFaceController.java b/src/main/java/com/whyc/controller/InterFaceController.java
index 828e3de..62f4695 100644
--- a/src/main/java/com/whyc/controller/InterFaceController.java
+++ b/src/main/java/com/whyc/controller/InterFaceController.java
@@ -2,6 +2,7 @@
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;
@@ -9,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
@RequestMapping("interface")
@RestController
@@ -31,7 +33,7 @@
@PostMapping("/getBattAlarm")
@ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁")
public Response getBattAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
- return service.getBattAlarm(interfaceParam.getBattgroupIds(), interfaceNumber);
+ return service.getBattAlarm(interfaceParam.getBattgroupIds(), interfaceNumber, null);
}
@PostMapping("/getDevAlarm")
@@ -59,10 +61,22 @@
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")
@@ -72,7 +86,7 @@
}
@PostMapping("/getRealtime")
- @ApiOperation("鑾峰彇瀹炴椂鏁版嵁")
+ @ApiOperation("鑾峰彇瀹炴椂鐘舵�佷俊鎭�")
public Response getRealtime(@RequestBody InterfaceParam interfaceParam) {
return service.getRealTime(interfaceParam);
}
@@ -96,9 +110,9 @@
}
@GetMapping("getBattStationInfoByStationId")
- @ApiOperation("鏍规嵁鏈烘埧id鑾峰彇鐢垫睜淇℃伅")
- public Response getBattStationInfoByStationId(@RequestParam String stationId,@RequestParam String interfaceName){
- return service.getBattStationInfoByStationId(stationId,interfaceName);
+ @ApiOperation("鑾峰彇鐢垫睜鏈烘埧淇℃伅")
+ public Response getBattStationInfoByStationId(@RequestParam String stationId,@RequestParam String interfaceNumber){
+ return service.getBattStationInfoByStationId(stationId,interfaceNumber);
}
/**
@@ -114,13 +128,19 @@
*/
@ApiOperation("鍙戦�佹寚浠�,鑾峰彇鍙傛暟(鍚姩|鍋滄|鑾峰彇鍙傛暟)")
@GetMapping("sendCmdGet")
- public Response sendCmdGet(@RequestParam int opCmd,@RequestParam Integer testCmd,@RequestParam int devId,@RequestParam int battGroupNum){
- return service.sendCmdGet(opCmd,testCmd,devId,battGroupNum);
+ 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){
- return service.sendCmdSet(param);
+ 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