From 89638a40fb7d82883e4d8fa1df2b3650f26949a7 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 01 二月 2021 15:34:17 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/BattInfController.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/BattInfController.java b/src/main/java/com/fgkj/controller/BattInfController.java
index 44be130..d6ef6ef 100644
--- a/src/main/java/com/fgkj/controller/BattInfController.java
+++ b/src/main/java/com/fgkj/controller/BattInfController.java
@@ -252,36 +252,44 @@
return service.findMenu();
}
-
- //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
- @GetMapping("judgeBatt")
- @ApiOperation(notes = "",value="鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪")
- public ServiceModel judgeBatt(@RequestBody BattInf binf){
+ //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
+ @PostMapping("judgeBatt")
+ @ApiOperation(notes = "",value="鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪")
+ public ServiceModel judgeBatt(@RequestParam String stationName) {
+ BattInf binf = new BattInf();
+ binf.setStationName(stationName);
return service.judgeBatt(binf);
}
- @GetMapping("byBattGroupId2")
+ @PostMapping("byBattGroupId2")
@ApiOperation(notes = "",value="byBattGroupId2")
- public ServiceModel findByBattGroupId(@RequestBody BattInf bif){
- ServiceModel model=service.findByBattGroupId(bif);
+ public ServiceModel findByBattGroupId(@RequestParam Integer battGroupId){
+ BattInf binf = new BattInf();
+ binf.setBattGroupId(battGroupId);
+ ServiceModel model=service.findByBattGroupId(binf);
return model;
}
//鏍规嵁鐢垫睜缁刬d鏌ヨ涓嶉噸澶嶇殑鍗曚綋缂栧彿
- @GetMapping("monNumByBattGroupId")
+ @PostMapping("monNumByBattGroupId")
@ApiOperation(notes = "",value="鐢垫睜缁刬d鏌ヨ涓嶉噸澶嶇殑鍗曚綋缂栧彿")
- public ServiceModelOnce serchByMonNum(@RequestBody BattInf bif){
+ public ServiceModelOnce serchByMonNum(@RequestParam Integer battGroupId) {
+ BattInf binf = new BattInf();
+ binf.setBattGroupId(battGroupId);
- return service.serchByMonNum(bif);
+ return service.serchByMonNum(binf);
}
-
- //5.3娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯(鏈搴旂敤)
- @Deprecated
- public ServiceModel serchBatt(@RequestBody BattInf bif) {
- // bif=ActionUtil.getGson("yyyy-MM-dd").fromJson(result,BattInf.class);
- return service.serchBatt(bif);
+ //5.3娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯(鏈搴旂敤)
+ @PostMapping("serchBatt")
+ @ApiOperation(notes = "缁撴灉闆�:{ \"code\": 1, \"msg\": null, \"data\": [{ \"stationId\": \"42010007\", \"stationName\": \"灞辫タ鐪�-澶師甯�-杩庢辰鍖�-灞�鏈烘埧119-灞�鏈烘埧绔�-1\", \"stationName1\": \"灞辫タ鐪乗"\"battGroupId\": 1000003, \"battGroupName\": \"鐢垫睜缁�1\", \"battGroupName\": \"鐢垫睜缁�1\" }]}",value="娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯(鏈搴旂敤)")
+ public ServiceModel serchBatt(@ApiParam(value = "鍦板潃",required = true) @RequestParam String stationName,@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1,@RequestParam Integer battGroupId) {
+ BattInf binf = new BattInf();
+ binf.setStationName(stationName);
+ binf.setStationName1(stationName1);
+ binf.setBattGroupId(battGroupId);
+ return service.serchBatt(binf);
}
//6.4.7鎸夊湴鍩熷拰鏍囩О鐢靛帇鍒嗙粍缁熻钃勭數姹犵粍鏈嶅焦瓒呮湡鐨勬暟閲�
--
Gitblit v1.9.1