From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/controller/PositionController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/controller/PositionController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/controller/PositionController.java
index 7765f56..deb3db0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/controller/PositionController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/controller/PositionController.java
@@ -41,6 +41,7 @@
/**
* 控制器
*
+ *
* @author BladeX
* @since 2020-07-13
*/
@@ -169,10 +170,7 @@
* @return
*/
@PostMapping("/selectry")
- public R selectry(String coordinate, HttpServletResponse response) {
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ public R selectry(String coordinate) {
return R.data(positionService.selectry(coordinate));
}
@@ -212,4 +210,14 @@
}
+ /**
+ * 通过警情位置查询附近安保人员
+ * @return
+ */
+ @PostMapping("/selectfj")
+ @ApiOperation(value = "通过警情位置查询附近安保人员", notes = "经纬度")
+ public R selectry(String jd,String wd) {
+ return R.data(positionService.selectfj(jd, wd));
+ }
+
}
--
Gitblit v1.9.3