|
|
|
@ -6,6 +6,7 @@ import com.cloud.kicc.common.core.api.R;
@@ -6,6 +6,7 @@ import com.cloud.kicc.common.core.api.R;
|
|
|
|
|
import com.cloud.kicc.common.core.constant.AppConstants; |
|
|
|
|
import com.cloud.kicc.system.api.entity.Menu; |
|
|
|
|
import com.cloud.kicc.system.api.entity.Region; |
|
|
|
|
import com.cloud.kicc.system.api.vo.ResultVo; |
|
|
|
|
import com.cloud.kicc.system.service.RegionService; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
@ -29,10 +30,9 @@ public class RegionController {
@@ -29,10 +30,9 @@ public class RegionController {
|
|
|
|
|
|
|
|
|
|
private final RegionService regionService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private LambdaQueryWrapper<Region> getQueryWrapper(Region region) { |
|
|
|
|
return new LambdaQueryWrapper<Region>() |
|
|
|
|
.like(StrUtil.isNotBlank(region.getName()), Region::getName, region.getName()) |
|
|
|
|
.eq(StrUtil.isNotBlank(region.getName()), Region::getName, region.getName()) |
|
|
|
|
.eq(StrUtil.isNotBlank(region.getCode()), Region::getCode, region.getCode()) |
|
|
|
|
.between(StrUtil.isNotBlank(region.getBeginTime()) && StrUtil.isNotBlank(region.getEndTime()), Region::getCreateTime, region.getBeginTime(), region.getEndTime()) |
|
|
|
|
.orderByAsc(Region::getSort); |
|
|
|
@ -51,7 +51,14 @@ public class RegionController {
@@ -51,7 +51,14 @@ public class RegionController {
|
|
|
|
|
|
|
|
|
|
@GetMapping("/{id:\\w+}") |
|
|
|
|
public R getById(@PathVariable("id") String id) { |
|
|
|
|
return R.ok(regionService.getById(id)); |
|
|
|
|
ResultVo<Region> resultVo = new ResultVo(); |
|
|
|
|
Region region = regionService.getById(id); |
|
|
|
|
resultVo.setResult(region); |
|
|
|
|
if(!"0".equals(region.getParentId())) { |
|
|
|
|
Region parentRegion = regionService.getById(region.getParentId()); |
|
|
|
|
resultVo.setExtend(parentRegion); |
|
|
|
|
} |
|
|
|
|
return R.ok(resultVo); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/save") |
|
|
|
|