From 8bec3dec1be46251000a7dbb9e759dae3b061110 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 01 二月 2021 17:29:58 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/BattMap_informationController.java | 107 +++++++++++++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/BattMap_informationController.java b/src/main/java/com/fgkj/controller/BattMap_informationController.java
index 427b81b..d638aea 100644
--- a/src/main/java/com/fgkj/controller/BattMap_informationController.java
+++ b/src/main/java/com/fgkj/controller/BattMap_informationController.java
@@ -8,6 +8,7 @@
import com.fgkj.services.User_logService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,10 +26,10 @@
@Resource
private User_logService uservice;
-
+
//9.1褰曞叆鏈烘埧淇℃伅
@PostMapping("/")
- @ApiOperation(notes = "",value="褰曞叆鏈烘埧淇℃伅")
+ @ApiOperation(notes = "{ \"stationId\": \"1\", \"stationName\": \"s\", \"stationName3\": \"61850鏈烘埧-2G\", \"address\": \" \", \"longitude\": 0.0, \"latitude\": 0.0, \"information\": \"f\", \"fBSDeviceId\": 0, \"stationName1\": \"婀栧寳鐪乗", \"stationName2\": \"姝︽眽甯俓", \"stationName5\": \"涓滆タ婀栧尯\" }",value="褰曞叆鏈烘埧淇℃伅")
public ServiceModel add(@RequestBody BattMap_information binfo){
// BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
ServiceModel model = service.add(binfo);
@@ -41,17 +42,20 @@
return model;
}
+
+
//9.1褰曞叆鏈烘埧淇℃伅
@PostMapping("dev")
- @ApiOperation(notes = "",value="褰曞叆鏈烘埧淇℃伅")
+ @ApiOperation(notes = "{ \"stationId\": \"1\", \"stationName\": \"s\", \"stationName3\": \"61850鏈烘埧-2G\", \"address\": \" \", \"longitude\": 0.0, \"latitude\": 0.0, \"information\": \"f\", \"fBSDeviceId\": 0, \"stationName1\": \"婀栧寳鐪乗", \"stationName2\": \"姝︽眽甯俓", \"stationName5\": \"涓滆タ婀栧尯\" }",value="褰曞叆鏈烘埧淇℃伅")
public ServiceModel addDev(@RequestBody BattMap_information binfo){
// BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
ServiceModel model = service.addDev(binfo);
return model;
}
+
@PutMapping("/")
- @ApiOperation(notes = "",value="淇敼")
+ @ApiOperation(notes = "{ \"num\": \"38\", \"stationId\": \"111\", \"stationName\": \"s\", \"stationName3\": \"61850鏈烘埧-2G\", \"address\": \" \", \"longitude\": 0.0, \"latitude\": 0.0, \"information\": \"f\", \"fBSDeviceId\": 0, \"stationName1\": \"婀栧寳鐪乗", \"stationName2\": \"姝︽眽甯俓", \"stationName5\": \"涓滆タ婀栧尯\" }",value="淇敼")
public ServiceModel update(@RequestBody BattMap_information binfo){
// BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
ServiceModel model = service.update(binfo);
@@ -61,8 +65,11 @@
//鍒犻櫎鏈烘埧鐨勪綅缃俊鎭�
@DeleteMapping("/")
@ApiOperation(notes = "",value="鍒犻櫎鏈烘埧鐨勪綅缃俊鎭�")
- public ServiceModel del(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ public ServiceModel del(@RequestParam String stationName3,@RequestParam Double longitude,@RequestParam Double latitude){
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationName(stationName3);
+ binfo.setLongitude(longitude);
+ binfo.setLatitude(latitude);
ServiceModel model = service.del(binfo);
{
String msg="鍒犻櫎"+binfo.getStationName()+"鐨勪綅缃�";
@@ -81,10 +88,11 @@
return list;
}
//9.1鍦板浘涓婃牴鎹淮鎶ゅ尯鏌ヨ鏈烘埧缁忕含搴�
- @GetMapping("byInfo")
+ @PostMapping("byInfo")
@ApiOperation(notes = "",value="鍦板浘涓婃牴鎹淮鎶ゅ尯鏌ヨ鏈烘埧缁忕含搴�")
- public ServiceModel serchByInfo(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ public ServiceModel serchByInfo(@RequestParam String stationId) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(stationId);
ServiceModel model = service.serchByInfo(binfo);
return model;
@@ -94,17 +102,19 @@
//9.1鐧惧害鍦板浘瀹氫綅鏍规嵁鐪佷唤鏌ヨ鎵�鏈夎鍖哄煙鐨勬満鎴�
@GetMapping("byCondition")
@ApiOperation(notes = "",value="鐧惧害鍦板浘瀹氫綅鏍规嵁鐪佷唤鏌ヨ鎵�鏈夎鍖哄煙鐨勬満鎴�")
- public List serchByCondition(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ public List serchByCondition(@RequestParam String address) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(address);
List list = service.serchByCondition(binfo);
return list;
}
//9.1鏈烘埧璇︽儏鏄剧ず鏈烘埧鍏蜂綋钀藉悗鍜屽憡璀︾殑淇℃伅(鏈烘埧淇℃伅鍐呭鐢诲浘)
- @GetMapping("monNum")
+ @PostMapping("monNum")
@ApiOperation(notes = "",value="鏈烘埧璇︽儏鏄剧ず鏈烘埧鍏蜂綋钀藉悗鍜屽憡璀︾殑淇℃伅(鏈烘埧淇℃伅鍐呭鐢诲浘)")
- public List serchMonNum(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ public List serchMonNum(@RequestParam String stationId) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(stationId);
List list = service.serchMonNum(binfo);
return list;
}
@@ -145,11 +155,12 @@
}
//9.1鐢垫睜瀵垮懡绠＄悊
- @GetMapping("byStationId")
+ @PostMapping("byStationId")
@ApiOperation(notes = "",value="鐢垫睜瀵垮懡绠＄悊")
- public ServiceModel serchByStationid(@RequestBody BattMap_information bmap){
- // BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
- ServiceModel model = service.serchByStationid(bmap);
+ public ServiceModel serchByStationid(@RequestParam String stationId) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(stationId);
+ ServiceModel model = service.serchByStationid(binfo);
return model;
}
@@ -164,43 +175,49 @@
}
//9.1鏍规嵁鐪佷唤鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夊煄甯�
- @GetMapping("stationName2")
- @ApiOperation(notes = "",value="鏍规嵁鐪佷唤鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夊煄甯�")
- public ServiceModel serchStationName2(@RequestBody BattMap_information bmap){
- // BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
- ServiceModel model = service.serchStationName2(bmap);
+ @PostMapping("stationName2")
+ @ApiOperation(notes = "妯＄硦鏌ヨ",value="鏍规嵁鐪佷唤鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夊煄甯�")
+ public ServiceModel serchStationName2(@RequestParam String address) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(address);
+ ServiceModel model = service.serchStationName2(binfo);
- return model;
- }
+ return model;
+ }
//鏍规嵁鐪�/甯�/鍖哄幙鏌ヨ鎵�鏈夌殑绔欑偣
- @GetMapping("stationName3")
- @ApiOperation(notes = "",value="鏍规嵁鐪�/甯�/鍖哄幙鏌ヨ鎵�鏈夌殑绔欑偣")
- public ServiceModel serchStationName3(@RequestBody BattInf binf){
- // BattInf binf = getGson().fromJson(json, BattInf.class);
- ServiceModel model = service.serchStationName3(binf);
+ @PostMapping("stationName3")
+ @ApiOperation(notes = "妯＄硦鏌ヨ s1,s2,s5",value="鏍规嵁鐪�/甯�/鍖哄幙鏌ヨ鎵�鏈夌殑绔欑偣")
+ public ServiceModel serchStationName3(@ApiParam(value = "鐪�",required = true) @RequestParam String stationName1, @ApiParam(value = "甯�",required = true) @RequestParam String stationName2, @ApiParam(value = "鍖�",required = true) @RequestParam String stationName5) {
+ BattInf binf = new BattInf();
+ binf.setStationName1(stationName1);
+ binf.setStationName2(stationName2);
+ binf.setStationName5(stationName5);
+ ServiceModel model = service.serchStationName3(binf);
- return model;
- }
+ return model;
+ }
//9.1鏍规嵁鐪佷唤鍜屽煄甯傛煡璇㈡満鎴挎墍鍦ㄧ殑鎵�鏈夋満鎴�
@GetMapping("stationName")
- @ApiOperation(notes = "",value="鏍规嵁鐪佷唤鍜屽煄甯傛煡璇㈡満鎴挎墍鍦ㄧ殑鎵�鏈夋満鎴�")
- public ServiceModel serchStationName(@RequestBody BattMap_information bmap){
- // BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
- ServiceModel model = service.serchStationName(bmap);
+ @ApiOperation(notes = "妯＄硦鏌ヨ",value="鏍规嵁鐪佷唤鍜屽煄甯傛煡璇㈡満鎴挎墍鍦ㄧ殑鎵�鏈夋満鎴�")
+ public ServiceModel serchStationName(@RequestParam String address) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(address);
+ ServiceModel model = service.serchStationName(binfo);
return model;
}
//鏌ヨ绔欑偣鐨勭粡绾害
@GetMapping("addressByStationName3")
- @ApiOperation(notes = "",value="鏌ヨ绔欑偣鐨勭粡绾害")
- public ServiceModel serchAddressByStationName3(@RequestBody BattMap_information bmap){
- // BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
- ServiceModel model = service.serchAddressByStationName3(bmap);
+ @ApiOperation(notes = "妯＄硦鏌ヨ",value="鏌ヨ绔欑偣鐨勭粡绾害")
+ public ServiceModel serchAddressByStationName3(@RequestParam String stationName) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationName(stationName);
+ ServiceModel model = service.serchAddressByStationName3(binfo);
- return model;
- }
-
+ return model;
+ }
-
-
+
+
+
}
--
Gitblit v1.9.1