From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java
index 81e0152..cf1aa72 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java
@@ -2,6 +2,7 @@
import com.stylefeng.guns.modular.system.model.Phone;
import com.stylefeng.guns.modular.system.service.IPhoneService;
+import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -13,6 +14,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -26,6 +28,13 @@
@Autowired
private IPhoneService phoneService;
+
+ @Autowired
+ private IUserInfoService userInfoService;
+
+
+
+
/**
* 获取系统所有电话
@@ -38,9 +47,10 @@
@ApiImplicitParam(value = "定位经度", name = "lat", required = true, dataType = "double"),
@ApiImplicitParam(value = "定位维度", name = "lnt", required = true, dataType = "double")
})
- public ResultUtil queryPhones(Double lat, Double lnt){
+ public ResultUtil queryPhones(Double lat, Double lnt, HttpServletRequest request){
try {
- List<Phone> phones = phoneService.queryPhones(lat, lnt);
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ List<Phone> phones = phoneService.queryPhones(uid, lat, lnt);
return ResultUtil.success(phones);
}catch (Exception e){
e.printStackTrace();
@@ -61,9 +71,10 @@
@ApiImplicitParam(value = "定位维度", name = "lnt", required = true, dataType = "double"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryCustomerPhone(Double lat, Double lnt){
+ public ResultUtil queryCustomerPhone(Double lat, Double lnt, HttpServletRequest request){
try {
- Map<String, Object> map = phoneService.queryCustomerPhone(lat, lnt);
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ Map<String, Object> map = phoneService.queryCustomerPhone(uid, lat, lnt);
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1