From aa43a92c7ec9053dbaef92fe5ccb3011b670442c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 12 七月 2023 11:46:21 +0800
Subject: [PATCH] 更新线上视频奖励模块接口
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 148 +++++++++++-------------------------------------
1 files changed, 35 insertions(+), 113 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 5c19204..375e825 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -3,14 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Store;
-import com.dsh.other.feignclient.model.StoreDetailOfCourse;
-import com.dsh.other.feignclient.model.StoreInfo;
-import com.dsh.other.feignclient.model.StoreLonLatList;
+import com.dsh.other.feignclient.model.*;
import com.dsh.other.model.BaseVo;
+import com.dsh.other.model.QueryStoreList;
import com.dsh.other.service.StoreService;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ResultUtil;
-import com.dsh.other.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +18,7 @@
import java.util.*;
@RestController
-@RequestMapping("/base/protocol")
+@RequestMapping("")
public class StoreController {
@Autowired
@@ -33,10 +31,10 @@
- @PostMapping("/storeDetail/courseOfSto")
+ @PostMapping("/base/protocol/storeDetail/courseOfSto")
public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId){
StoreDetailOfCourse ofCourse = new StoreDetailOfCourse();
- Store store = stoService.getById(storeId);
+ Store store = storeService.getById(storeId);
if (null != store){
ofCourse.setStoreName(store.getName());
ofCourse.setStoreAddr(store.getAddress());
@@ -44,18 +42,18 @@
return ofCourse;
}
- @PostMapping("/storeDetail/nearbyStore")
- public List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude,@RequestBody String latitude){
- String current = longitude+","+latitude;
+ @PostMapping("/base/protocol/storeDetail/nearbyStore")
+ public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list ){
+ String current = list.getLongitude()+","+list.getLatitude();
List<StoreInfo> storeInfos = new ArrayList<>();
String cityCode = "";
try {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
cityCode = geocode.get("cityCode");
}catch (Exception e){
e.printStackTrace();
}
- List<Store> storeList = stoService.list(new QueryWrapper<Store>()
+ List<Store> storeList = storeService.list(new QueryWrapper<Store>()
.eq("state", 1)
.eq("cityCode",cityCode));
if (storeList.size() > 0){
@@ -83,14 +81,28 @@
return storeInfos;
}
+ /**
+ * 根据门店坐标与传入坐标，计算距离
+ * @param distanceVo
+ * @return
+ */
+ @PostMapping("/base/protocol/storeDetail/distanceCal")
+ public long calculateDistance(@RequestBody GetDistanceVo distanceVo){
+ String current = distanceVo.getLongitude()+","+distanceVo.getLatitude();
+ Store store = storeService.getById(distanceVo.getStoreId());
+ String result = store.getLon()+","+store.getLat();
+ String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
+ return Long.parseLong(distanceTOKilometer);
+ }
- @PostMapping("/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude){
+
+ @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
+ public List<StoreLonLatList> getAllStoreLonLats(@RequestBody GetAllNearbyStoreList list ){
List<StoreLonLatList> storeInfos = new ArrayList<>();
try {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
String cityCode = geocode.get("cityCode");
- List<Store> storeList = stoService.list(new QueryWrapper<Store>()
+ List<Store> storeList = storeService.list(new QueryWrapper<Store>()
.eq("cityCode",cityCode));
if (storeList.size() > 0){
for (Store store : storeList) {
@@ -115,15 +127,13 @@
/**
* 获取门店列表
- * @param provinceCode
- * @param cityCode
* @return
*/
@ResponseBody
@PostMapping("/store/queryStoreList")
- public List<Store> queryStoreList(@RequestBody String provinceCode, @RequestBody String cityCode){
+ public List<Store> queryStoreList(QueryStoreList queryStoreList){
try {
- return storeService.queryStorsList(provinceCode, cityCode);
+ return storeService.queryStorsList(queryStoreList.getProvinceCode(), queryStoreList.getCityCode());
}catch (Exception e){
e.printStackTrace();
return new ArrayList<>();
@@ -136,18 +146,12 @@
@ResponseBody
@PostMapping("/base/store/queryStoreLists")
- @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃"})
+ @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃", "APP-课程列表"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = true),
- @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
+ @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = false),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
})
- public ResultUtil<List<BaseVo>> queryStoreLists(@RequestBody String lon, @RequestBody String lat){
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat");
- }
+ public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat){
try {
List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat);
return ResultUtil.success(baseVos);
@@ -165,7 +169,7 @@
*/
@ResponseBody
@PostMapping("/store/queryStoreListByName")
- public List<Store> queryStoreListByName(@RequestBody String name){
+ public List<Store> queryStoreListByName(@RequestParam("name") String name){
try {
List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name));
return stores;
@@ -192,86 +196,4 @@
}
}
-
-
-
-
- /**
- * 获取门店列表
- * @param provinceCode
- * @param cityCode
- * @return
- */
- @ResponseBody
- @PostMapping("/store/queryStoreList")
- public List<Store> queryStoreList(@RequestBody String provinceCode, @RequestBody String cityCode){
- try {
- return storeService.queryStorsList(provinceCode, cityCode);
- }catch (Exception e){
- e.printStackTrace();
- return new ArrayList<>();
- }
- }
-
-
-
-
-
- @ResponseBody
- @PostMapping("/base/store/queryStoreLists")
- @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃"})
- @ApiImplicitParams({
- @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = true),
- @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
- })
- public ResultUtil<List<BaseVo>> queryStoreLists(@RequestBody String lon, @RequestBody String lat){
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat");
- }
- try {
- List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat);
- return ResultUtil.success(baseVos);
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- }
-
-
- /**
- * 根据门店模糊搜索店铺
- * @param name
- * @return
- */
- @ResponseBody
- @PostMapping("/store/queryStoreListByName")
- public List<Store> queryStoreListByName(@RequestBody String name){
- try {
- List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name));
- return stores;
- }catch (Exception e){
- e.printStackTrace();
- return new ArrayList<>();
- }
- }
-
-
- /**
- * 根据门店
- * @param id
- * @return
- */
- @ResponseBody
- @PostMapping("/store/queryStoreById")
- public Store queryStoreById(@RequestBody Integer id){
- try {
- return storeService.getById(id);
- }catch (Exception e){
- e.printStackTrace();
- return null;
- }
- }
}
--
Gitblit v1.7.1