java/QianYunTong.git

			@@ -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();