Commit abd657e5 authored by zhengyi's avatar zhengyi

客户端国家城市管理权限放开

parent e5c1b062
...@@ -40,7 +40,6 @@ public class AppRegionController { ...@@ -40,7 +40,6 @@ public class AppRegionController {
@GetMapping("/get") @GetMapping("/get")
@ApiOperation("获得区域设置") @ApiOperation("获得区域设置")
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@PreAuthorize("@ss.hasPermission('ecw:region:query')")
public CommonResult<RegionRespVO> getRegion(@RequestParam("id") Long id) { public CommonResult<RegionRespVO> getRegion(@RequestParam("id") Long id) {
RegionDO region = regionService.getRegion(id); RegionDO region = regionService.getRegion(id);
return success(RegionConvert.INSTANCE.convert(region)); return success(RegionConvert.INSTANCE.convert(region));
...@@ -50,7 +49,7 @@ public class AppRegionController { ...@@ -50,7 +49,7 @@ public class AppRegionController {
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("获得区域设置列表") @ApiOperation("获得区域设置列表")
@PreAuthenticated // @PreAuthenticated
public CommonResult<List<RegionRespVO>> getRegionList(RegionListReqVO reqVO) { public CommonResult<List<RegionRespVO>> getRegionList(RegionListReqVO reqVO) {
List<RegionDO> list = regionService.getSimpleDepts(reqVO); List<RegionDO> list = regionService.getSimpleDepts(reqVO);
list.sort(Comparator.comparing(RegionDO::getSort)); list.sort(Comparator.comparing(RegionDO::getSort));
...@@ -59,7 +58,7 @@ public class AppRegionController { ...@@ -59,7 +58,7 @@ public class AppRegionController {
@GetMapping("/page") @GetMapping("/page")
@ApiOperation("获得区域设置分页") @ApiOperation("获得区域设置分页")
@PreAuthenticated // @PreAuthenticated
public CommonResult<PageResult<RegionRespVO>> getRegionPage(@Valid RegionPageReqVO pageVO) { public CommonResult<PageResult<RegionRespVO>> getRegionPage(@Valid RegionPageReqVO pageVO) {
PageResult<RegionDO> pageResult = regionService.getRegionPage(pageVO); PageResult<RegionDO> pageResult = regionService.getRegionPage(pageVO);
return success(RegionConvert.INSTANCE.convertPage(pageResult)); return success(RegionConvert.INSTANCE.convertPage(pageResult));
...@@ -68,7 +67,7 @@ public class AppRegionController { ...@@ -68,7 +67,7 @@ public class AppRegionController {
@GetMapping("/getTree") @GetMapping("/getTree")
@ApiOperation("获得区域子列表") @ApiOperation("获得区域子列表")
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@PreAuthenticated // @PreAuthenticated
public CommonResult<RegionRespVO> getTree(@RequestParam("id") Long id) { public CommonResult<RegionRespVO> getTree(@RequestParam("id") Long id) {
List<RegionDO> list = regionService.getByParent(id); List<RegionDO> list = regionService.getByParent(id);
List<RegionRespVO> dataList = RegionConvert.INSTANCE.convertList(list); List<RegionRespVO> dataList = RegionConvert.INSTANCE.convertList(list);
...@@ -83,7 +82,7 @@ public class AppRegionController { ...@@ -83,7 +82,7 @@ public class AppRegionController {
@GetMapping("/getListTree") @GetMapping("/getListTree")
@ApiOperation("获得区域设置列表") @ApiOperation("获得区域设置列表")
@PreAuthenticated // @PreAuthenticated
public CommonResult<List<RegionRespVO>> listTree(RegionListReqVO reqVO) { public CommonResult<List<RegionRespVO>> listTree(RegionListReqVO reqVO) {
List<RegionDO> list = regionService.getSimpleDepts(reqVO); List<RegionDO> list = regionService.getSimpleDepts(reqVO);
list.sort(Comparator.comparing(RegionDO::getSort)); list.sort(Comparator.comparing(RegionDO::getSort));
...@@ -108,7 +107,7 @@ public class AppRegionController { ...@@ -108,7 +107,7 @@ public class AppRegionController {
@GetMapping("/getCityList") @GetMapping("/getCityList")
@ApiOperation("获得区域城市列表") @ApiOperation("获得区域城市列表")
@PreAuthenticated // @PreAuthenticated
public CommonResult<List<RegionRespVO>> getCityList() { public CommonResult<List<RegionRespVO>> getCityList() {
List<RegionDO> cityList = regionService.getCityList(); List<RegionDO> cityList = regionService.getCityList();
return success(RegionConvert.INSTANCE.convertList(cityList)); return success(RegionConvert.INSTANCE.convertList(cityList));
...@@ -116,7 +115,7 @@ public class AppRegionController { ...@@ -116,7 +115,7 @@ public class AppRegionController {
@GetMapping("/getTradeCityList") @GetMapping("/getTradeCityList")
@ApiOperation("获得始发、目的城市列表") @ApiOperation("获得始发、目的城市列表")
@PreAuthenticated // @PreAuthenticated
public CommonResult<List<RegionRespVO>> getTradeCityList(TradeRegionListReqVO reqVO) { public CommonResult<List<RegionRespVO>> getTradeCityList(TradeRegionListReqVO reqVO) {
if (Objects.nonNull(reqVO.getChannelId())){ if (Objects.nonNull(reqVO.getChannelId())){
// 如果有渠道信息,则查询可出目的地国家下的目的地城市 // 如果有渠道信息,则查询可出目的地国家下的目的地城市
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment