From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/controller/RealContoller.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RealContoller.java b/src/main/java/com/whyc/controller/RealContoller.java
index 0fe7730..1855bb5 100644
--- a/src/main/java/com/whyc/controller/RealContoller.java
+++ b/src/main/java/com/whyc/controller/RealContoller.java
@@ -39,13 +39,13 @@
@ApiOperation(value = "绯荤粺姒傝鑾峰彇鍓嶄竴鐧炬瘮鏃堕棿闂撮殧鏁版嵁鐩存祦杈撳嚭缁熻")
@GetMapping("getPwrHisDcoutData100")
- public Response getPwrHisDcoutData100(@RequestParam Integer powerId){
+ public Response getPwrHisDcoutData100(@RequestParam Integer powerId) throws ParseException, InterruptedException {
return pwrdevHistorydataIdService.getHalfHourPwrHisDcoutData(powerId);
}
@ApiOperation(value = "绯荤粺姒傝鑾峰彇鍓嶄竴鐧炬瘮鏃堕棿闂撮殧鏁版嵁鏍稿璁惧淇℃伅")
@GetMapping("getBattDevData100")
- public Response getBattDevData100(@RequestParam Integer powerId,@RequestParam Integer battgroupId){
+ public Response getBattDevData100(@RequestParam Integer powerId,@RequestParam Integer battgroupId) throws ParseException, InterruptedException {
return battRealdataIdService.getBattDevData100(powerId,battgroupId);
}
@@ -62,10 +62,16 @@
return tdataIdService.getTinfDataWithTestRecordCount(battgroupId,testRecordCount,recordNum,granularity);
}
- @ApiOperation(value = "鍘嗗彶瀹炴椂鏌ヨ")
+ @ApiOperation(value = "鐢垫睜鍘嗗彶瀹炴椂鏌ヨ")
@GetMapping("getBattRealDataHis")
public Response getBattRealDataHis(@RequestParam Integer battgroupId,@RequestParam Integer granularity
,@RequestParam String startTime,@RequestParam String endTime) throws ParseException, InterruptedException {
return battRealdataIdService.getBattRealDataHis(battgroupId,granularity,startTime,endTime);
}
+ @ApiOperation(value = "鐢垫簮鍘嗗彶瀹炴椂鏌ヨ")
+ @GetMapping("getPwrRealDataHis")
+ public Response getPwrRealDataHis(@RequestParam Integer powerId,@RequestParam Integer granularity
+ ,@RequestParam String startTime,@RequestParam String endTime) throws ParseException, InterruptedException {
+ return pwrdevHistorydataIdService.getPwrRealDataHis(powerId,granularity,startTime,endTime);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1