From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java
index c975f99..753583e 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java
@@ -8,7 +8,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.stylefeng.guns.modular.system.warpper.CouponWarpper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -25,7 +24,6 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import java.util.Map;
@Api("新增2.0")
@RestController
@@ -63,6 +61,9 @@
@Autowired
private ICompanyService companyService;
+
+ @Autowired
+ private IOpenCityService openCityService;
@@ -223,17 +224,20 @@
@ResponseBody
@PostMapping("/base/newlyAdded/getShowModular")
- @ApiOperation(value = "获取显示模块设置", tags = {"用户端-2.0新增"}, notes = "")
+ @ApiOperation(value = "获取显示模块设置(黔云通)", tags = {"用户端-2.0新增"}, notes = "")
@ApiImplicitParams({
+ @ApiImplicitParam(value = "当前经度", name = "lon", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "当前纬度", name = "lon", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<TbShowModular>> getShowModular(HttpServletRequest request){
+ public ResultUtil<List<TbShowModular>> getShowModular(String lon, String lat, HttpServletRequest request){
try {
// Integer uid = userInfoService.getUserIdFormRedis(request);
// if(null == uid){
// return ResultUtil.tokenErr();
// }
- return ResultUtil.success(showModularService.selectList(null));
+ OpenCity openCity = openCityService.openCity1(lon, lat);
+ return ResultUtil.success(showModularService.selectList(new EntityWrapper<TbShowModular>().eq("openCityId",openCity.getId())));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1