From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/BattMap_informationController.java | 119 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/BattMap_informationController.java b/src/main/java/com/fgkj/controller/BattMap_informationController.java
index 6c7551b..a00e752 100644
--- a/src/main/java/com/fgkj/controller/BattMap_informationController.java
+++ b/src/main/java/com/fgkj/controller/BattMap_informationController.java
@@ -7,6 +7,8 @@
import com.fgkj.services.BattMap_informationService;
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.*;
@@ -16,7 +18,7 @@
@RequestMapping("battMapInformation")
@RestController
-@Api
+@Api(tags = "battMapInformation鎺ュ彛")
public class BattMap_informationController{
@Resource
@@ -24,9 +26,10 @@
@Resource
private User_logService uservice;
-
+
//9.1褰曞叆鏈烘埧淇℃伅
@PostMapping("/")
+ @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);
@@ -39,15 +42,20 @@
return model;
}
+
+
//9.1褰曞叆鏈烘埧淇℃伅
@PostMapping("dev")
+ @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 = "{ \"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);
@@ -56,11 +64,18 @@
}
//鍒犻櫎鏈烘埧鐨勪綅缃俊鎭�
@DeleteMapping("/")
- public ServiceModel del(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ @ApiOperation(notes = "",value="鍒犻櫎鏈烘埧鐨勪綅缃俊鎭�")
+ public ServiceModel del(@ApiParam(value = "绔欑偣",required = true) @RequestParam String stationName,
+ @ApiParam(value = "鏈烘埧",required = true) @RequestParam String stationName3,
+ @ApiParam(value = "缁忓害",required = true) @RequestParam Double longitude,
+ @ApiParam(value = "绾害",required = true) @RequestParam Double latitude){
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationName3(stationName3);
+ binfo.setLongitude(longitude);
+ binfo.setLatitude(latitude);
ServiceModel model = service.del(binfo);
{
- String msg="鍒犻櫎"+binfo.getStationName()+"鐨勪綅缃�";
+ String msg="鍒犻櫎"+stationName+"鐨勪綅缃�";
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
}
@@ -70,14 +85,17 @@
//9.1鐧惧害鍦板浘瀹氫綅鏌ヨ鐢垫睜缁勪俊鎭�
@GetMapping("all")
+ @ApiOperation(notes = "",value="鐧惧害鍦板浘瀹氫綅鏌ヨ鐢垫睜缁勪俊鎭�")
public List searchAll(){
List list = service.searchAll();
return list;
}
//9.1鍦板浘涓婃牴鎹淮鎶ゅ尯鏌ヨ鏈烘埧缁忕含搴�
- @GetMapping("byInfo")
- public ServiceModel serchByInfo(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ @PostMapping("byInfo")
+ @ApiOperation(notes = "",value="鍦板浘涓婃牴鎹淮鎶ゅ尯鏌ヨ鏈烘埧缁忕含搴�")
+ public ServiceModel serchByInfo(@RequestParam String stationId) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(stationId);
ServiceModel model = service.serchByInfo(binfo);
return model;
@@ -86,22 +104,27 @@
//9.1鐧惧害鍦板浘瀹氫綅鏍规嵁鐪佷唤鏌ヨ鎵�鏈夎鍖哄煙鐨勬満鎴�
@GetMapping("byCondition")
- public List serchByCondition(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ @ApiOperation(notes = "妯＄硦鏌ヨ",value="鐧惧害鍦板浘瀹氫綅鏍规嵁鐪佷唤鏌ヨ鎵�鏈夎鍖哄煙鐨勬満鎴�")
+ public List serchByCondition(@RequestParam String address) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setAddress(address);
List list = service.serchByCondition(binfo);
return list;
}
//9.1鏈烘埧璇︽儏鏄剧ず鏈烘埧鍏蜂綋钀藉悗鍜屽憡璀︾殑淇℃伅(鏈烘埧淇℃伅鍐呭鐢诲浘)
- @GetMapping("monNum")
- public List serchMonNum(@RequestBody BattMap_information binfo){
- // BattMap_information binfo = getGson().fromJson(json, BattMap_information.class);
+ @PostMapping("monNum")
+ @ApiOperation(notes = "",value="鏈烘埧璇︽儏鏄剧ず鏈烘埧鍏蜂綋钀藉悗鍜屽憡璀︾殑淇℃伅(鏈烘埧淇℃伅鍐呭鐢诲浘)")
+ public List serchMonNum(@RequestParam String stationId) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(stationId);
List list = service.serchMonNum(binfo);
return list;
}
//9.1鏌ヨ鏈坊鍔犵墿鐞嗕俊鎭殑鏈烘埧
@GetMapping("notInBattMap")
+ @ApiOperation(notes = "",value="鏌ヨ鏈坊鍔犵墿鐞嗕俊鎭殑鏈烘埧")
public ServiceModel serchNotInBattMap(){
ServiceModel model = service.serchNotInBattMap();
@@ -109,6 +132,7 @@
}
//9.1鏌ヨ鏈坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�)
@GetMapping("notInBattMapByUid")
+ @ApiOperation(notes = "",value="鏌ヨ鏈坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�)")
public ServiceModel serchNotInBattMapByUid() {
User_inf uinf=(User_inf) ActionUtil.getUser();
ServiceModel model = service.serchNotInBattMapByUid(uinf);
@@ -117,6 +141,7 @@
}
//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨�)
@GetMapping("inBattMapByUid")
+ @ApiOperation(notes = "",value="鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨�)")
public ServiceModel serchInBattMapByUid() {
User_inf uinf=(User_inf) ActionUtil.getUser();
ServiceModel model = service.serchInBattMapByUid(uinf);
@@ -125,6 +150,7 @@
}
//9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�) 鍖呮嫭(鍛婅鎬绘暟钀藉悗鎬绘暟寤惰繜鎬绘暟)
@GetMapping("userManageStation")
+ @ApiOperation(notes = "code 鍛婅鎬绘暟锛泂um 钀藉悗鎬绘暟锛沶ewsum 寤舵椂鎬绘暟锛沵sg 61850鐘舵�侊紱msgN 璁惧id",value="棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�) 鍖呮嫭(鍛婅鎬绘暟钀藉悗鎬绘暟寤惰繜鎬绘暟)")
public List searchUserManageStation() {
User_inf uinf=(User_inf) ActionUtil.getUser();
List list = service.searchUserManageStation(uinf);
@@ -132,16 +158,19 @@
}
//9.1鐢垫睜瀵垮懡绠＄悊
- @GetMapping("byStationId")
- public ServiceModel serchByStationid(@RequestBody BattMap_information bmap){
- // BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
- ServiceModel model = service.serchByStationid(bmap);
+ @PostMapping("byStationId")
+ @ApiOperation(notes = "",value="鐢垫睜瀵垮懡绠＄悊")
+ public ServiceModel serchByStationid(@RequestParam String stationId) {
+ BattMap_information binfo = new BattMap_information();
+ binfo.setStationId(stationId);
+ ServiceModel model = service.serchByStationid(binfo);
return model;
}
//9.1鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夌渷浠�
@GetMapping("stationName1")
+ @ApiOperation(notes = "",value="鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夌渷浠�")
public ServiceModel serchStationName1(){
ServiceModel model = service.serchStationName1();
@@ -149,39 +178,49 @@
}
//9.1鏍规嵁鐪佷唤鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夊煄甯�
- @GetMapping("stationName2")
- 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.setAddress(address);
+ ServiceModel model = service.serchStationName2(binfo);
- return model;
- }
+ return model;
+ }
//鏍规嵁鐪�/甯�/鍖哄幙鏌ヨ鎵�鏈夌殑绔欑偣
- @GetMapping("stationName3")
- 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")
- 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.setAddress(address);
+ ServiceModel model = service.serchStationName(binfo);
return model;
}
//鏌ヨ绔欑偣鐨勭粡绾害
@GetMapping("addressByStationName3")
- 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