From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-
---
src/main/java/com/whyc/controller/BattInfController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattInfController.java b/src/main/java/com/whyc/controller/BattInfController.java
index c8dedef..d4615a7 100644
--- a/src/main/java/com/whyc/controller/BattInfController.java
+++ b/src/main/java/com/whyc/controller/BattInfController.java
@@ -22,7 +22,7 @@
@RequestMapping("battInf")
@RestController
@Api(tags = "鏁版嵁绠＄悊-鐢垫睜淇℃伅")
-public class BattInfController {
+public class BattInfController extends BaseController{
@Autowired
private BattInfService service;
@@ -64,6 +64,13 @@
UserInf userInf = (UserInf) ActionUtil.getUser();
return service.searchStationNameInGroup(userInf.getUId().intValue(), stationName1);
}
+ @GetMapping("/searchStationNameInGroup2")
+ @ApiOperation(value = "鏌ヨ鐢ㄦ埛绠＄悊涓嬬殑鏈烘埧",notes = "鍘焥erchStationNameInGroup鎺ュ彛锛岃繑鍥瀞tationName")
+ public Response searchBattGroupByStationName2(@RequestParam(required = false)String stationName1){
+ UserInf userInf = (UserInf) ActionUtil.getUser();
+ return service.searchStationNameInGroup2(userInf.getUId().intValue(), stationName1);
+ }
+
@GetMapping("/searchInform")
@ApiOperation(value = "鐢垫睜缁勪俊鎭厤缃腑鏌ヨ鎵�鏈夌殑鐢垫睜缁勪俊鎭�")
public Response searchInform(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam(required = false)String stationName1,@RequestParam(required = false)String stationName2,@RequestParam(required = false)String stationName5,@RequestParam(required = false)String stationName3){
@@ -93,33 +100,33 @@
return service.add(battinf,userInf.getUId().intValue());
}
- @DeleteMapping
+ @PostMapping("delete")
@ApiOperation(value = "鍒犻櫎鐢垫睜缁�")
public Response delete(@RequestParam Integer battgroupId){
service.deleteByBattgroupId(battgroupId);
return new Response().setII(1,"鍒犻櫎鎴愬姛");
}
- @PutMapping
+ @PostMapping("update")
@ApiOperation(value = "鏇存柊鐢垫睜缁�")
public Response update(@RequestBody Battinf battinf){
return service.update(battinf);
}
- @PutMapping("/updateList")
+ @PostMapping("/updateList")
@ApiOperation(value = "鏇存柊鐢垫睜缁凩ist")
public Response updateList(@RequestBody List<Battinf> battinfs){
return service.updateList(battinfs);
}
- @PutMapping("/updatePubByDevId")
+ @PostMapping("/updatePubByDevId")
@ApiOperation(value = "鏍规嵁璁惧id淇敼PublicKeyY鍊�")
public Response updatePubByDevId(@RequestParam String publicKeyY,@RequestParam Integer deviceId){
return service.updatePublicKeyByDevId(publicKeyY,deviceId);
}
- @PutMapping("/updateIP")
+ @PostMapping("/updateIP")
@ApiOperation(value = "鏇存柊鐢垫睜缁勭綉鍏崇瓑淇℃伅",notes = "todo杩橀渶鍚戣澶囧彂閫佺浉鍏虫寚浠ゅ拰鏈嶅姟闇�閲嶅惎")
public Response updateIp(@RequestBody Battinf battinf){
//todo Fbs9100_setparamImpl().sendCmdToFBS9100Dev
@@ -277,7 +284,13 @@
return new Response().set(1, service.searchMaxDevId(devId));
}
- @PutMapping("monCapWH")
+ @GetMapping("setKeyIdWithDeviceId")
+ @ApiOperation(value = "keyid缁戝畾璁惧id", notes = "鏃�:BattInfAction!getDeviceId")
+ public Response setKeyIdWithDeviceId(@RequestParam Integer devId,@RequestParam String keyId) {
+ return service.setKeyIdWithDeviceId(devId,keyId);
+ }
+
+ @PostMapping("updateMonCapWH")
@ApiModelProperty(value = "鏍囩О瀹归噺KWH淇敼", notes = "浼犲叆battGroupId鍜宯omCapWH")
public Response updateMonCapWH(@RequestBody Battinf inf) {
return service.updateMonCapWH(inf);
--
Gitblit v1.9.1