From bec5cb722440d35c2e28d81b26c0cf4e39dfdd49 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 三月 2023 09:22:16 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 26 ++++++++++++++++++++++++++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java | 25 +++++++++++++++++--------
2 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index 54b8b89..d114fa1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -138,6 +138,32 @@
}
}
+
+
+ @ResponseBody
+ @PostMapping("/base/queryCaptcha1")
+ @ApiOperation(value = "获取短信验证码", tags = {"用户端-登录"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String")
+ })
+ public ResultUtil queryCaptcha1(String phone, Integer type){
+ if(ToolUtil.isNotEmpty(phone)){
+ try {
+ return userInfoService.queryCaptcha(phone, type);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }else{
+ return ResultUtil.paranErr();
+ }
+ }
+
+
+
+
+
@ResponseBody
@PostMapping("/base/sedEmail")
@ApiOperation(value = "获取邮箱验证码【1.0】", tags = {"用户端-登录"}, notes = "")
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java
index 5de5bdc..80b9c1f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java
@@ -198,14 +198,23 @@
* @throws Exception
*/
public static DistancematrixVo getDistancematrix(Double sLat, Double sLnt, Double eLat, Double eLnt) throws Exception{
- ReverseGeocodeVo reverseGeocode = getReverseGeocode(sLat, sLnt);
- ReverseGeocodeVo reverseGeocode1 = getReverseGeocode(eLat, eLnt);
- if(null != reverseGeocode && null != reverseGeocode1){
- String origin = reverseGeocode.getAddress();
- String destination = reverseGeocode1.getAddress();
- return getDistancematrix(origin, destination);
- }
- return null;
+ GeoApiContext context = new GeoApiContext.Builder()
+ .apiKey(key)
+ .build();
+ DistanceMatrixApiRequest request = DistanceMatrixApi.newRequest(context);
+ request.origins(new LatLng(sLat, sLnt));
+ request.destinations(new LatLng(eLat, eLnt));
+ request.mode(TravelMode.DRIVING);//出行方式（驾车）
+ DistanceMatrix distanceMatrix = request.await();
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ System.out.println(gson.toJson(distanceMatrix));
+ context.shutdown();
+
+ DistanceMatrixElement elements = distanceMatrix.rows[0].elements[0];
+ DistancematrixVo vo = new DistancematrixVo();
+ vo.setDistance(elements.distance.inMeters);
+ vo.setDuration(elements.duration.inSeconds);
+ return vo;
}
--
Gitblit v1.7.1