From 24b8500fc153d16490b04b027fbb59e898859eb0 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 18 七月 2023 17:02:26 +0800
Subject: [PATCH] powerInf/getPowerDevicesPage 添加电源品牌 powerProducer 全部就不传
---
src/main/java/com/whyc/controller/PowerInfController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PowerInfController.java b/src/main/java/com/whyc/controller/PowerInfController.java
index e531c53..528123c 100644
--- a/src/main/java/com/whyc/controller/PowerInfController.java
+++ b/src/main/java/com/whyc/controller/PowerInfController.java
@@ -150,9 +150,12 @@
@GetMapping("getPowerDevicesPage")
@ApiOperation(value = "鐢ㄦ埛绠＄悊鐨勭數婧愪俊鎭垎椤�")
- public Response getPowerDevicesPage(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam(required = false) String stationId, @RequestParam(required = false) String stationName1,@RequestParam(required = false) String stationName2,@RequestParam(required = false) String stationName5){
+ public Response getPowerDevicesPage(@RequestParam int pageNum, @RequestParam int pageSize
+ , @RequestParam(required = false) String stationId, @RequestParam(required = false) String stationName1
+ , @RequestParam(required = false) String stationName2, @RequestParam(required = false) String stationName5
+ , @RequestParam(required = false) String powerProducer) {
UserInf userInf = (UserInf) ActionUtil.getUser();
- return service.getPowerDevicesPage(pageNum,pageSize,userInf.getUId(),stationId, stationName1,stationName2,stationName5);
+ return service.getPowerDevicesPage(pageNum, pageSize, userInf.getUId(), stationId, stationName1, stationName2, stationName5, powerProducer);
}
@@ -200,4 +203,10 @@
UserInf userInf = (UserInf) ActionUtil.getUser();
return service.getPwrInf(userInf.getUId());
}
+
+ @GetMapping("getPwrProducer")
+ @ApiOperation(value = "鑾峰彇鎵�鏈夌殑鐢垫簮鍝佺墝")
+ public Response getPwrProducer() {
+ return service.getPwrProducer();
+ }
}
--
Gitblit v1.9.1