接口修改完成

aidex-admin/src/main/resources/application.yml

@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.243
+    host: 182.150.25.30
     # 端口，默认为6379
-    port: 6379
+    port: 2212
     # 数据库索引
     database: 0
     # 密码
-    password: 12345678
+    password: Shs2514
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -123,7 +123,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: false
+  enabled: true
   # 请求前缀
   pathMapping: /api
 

aidex-admin/target/classes/application.yml

@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.243
+    host: 182.150.25.30
     # 端口，默认为6379
-    port: 6379
+    port: 2212
     # 数据库索引
     database: 0
     # 密码
-    password: 12345678
+    password: Shs2514
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -123,7 +123,7 @@ pagehelper:
 # Swagger配置
 swagger:
   # 是否开启swagger
-  enabled: false
+  enabled: true
   # 请求前缀
   pathMapping: /api
 

aidex-controller/src/main/java/com/aidex/web/controller/app/AppController.java

@@ -58,20 +58,22 @@ public class AppController {
     }
 
     @GetMapping("/location")
-    @ApiOperation(value = "获取全部船只位置", notes = "获取全部船只位置", produces = "application/json")
+    @ApiOperation(value = "获取离我最近的船只位置", notes = "获取离我最近的船只位置", produces = "application/json")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "direction", value = "正向（TRUE）/反向（FALSE）、默认正向", required = true, dataType = "Boolean", paramType = "query")})
-    public R<List<LocationVO>> getLocationAll(@RequestParam(defaultValue = "true", name = "direction") Boolean direction)
+            @ApiImplicitParam(name = "direction", value = "正向（TRUE）/反向（FALSE）、默认正向", required = true, dataType = "Boolean"),
+            @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "String")})
+    public R<LocationVO> getLocationAll(@RequestParam(defaultValue = "true", name = "direction") Boolean direction,@RequestParam(defaultValue = "",name = "lat") String lat, @RequestParam(defaultValue = "",name = "lon") String lon )
     {
-        return R.data(iAppService.findAllLocation(direction));
+        return R.data(iAppService.findAllLocationByNext(direction,lat,lon));
     }
 
     @GetMapping("/wharf/my")
     @ApiOperation(value = "获取离我最近的站点及距离", notes = "获取离我最近的站点及距离", produces = "application/json")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "String", paramType = "query")})
-    public R<List<SysWharfVO>> getWharfMy(@RequestParam(defaultValue = "",name = "lat") String lat, @RequestParam(defaultValue = "",name = "lon") String lon )
+            @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "String")})
+    public R<SysWharfVO> getWharfMy(@RequestParam(defaultValue = "",name = "lat") String lat, @RequestParam(defaultValue = "",name = "lon") String lon )
     {
         return R.data(iAppService.findNearestStation(lat,lon));
     }