add根据pid获取下级区域接口
This commit is contained in:
@ -15,7 +15,10 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.pictc.enums.ValidEnum;
|
||||||
import com.pictc.utils.CollectionUtils;
|
import com.pictc.utils.CollectionUtils;
|
||||||
|
import com.xjrsoft.common.constant.GlobalConstant;
|
||||||
import com.xjrsoft.common.enums.YesOrNoEnum;
|
import com.xjrsoft.common.enums.YesOrNoEnum;
|
||||||
import com.xjrsoft.common.model.result.R;
|
import com.xjrsoft.common.model.result.R;
|
||||||
import com.xjrsoft.common.page.ConventPage;
|
import com.xjrsoft.common.page.ConventPage;
|
||||||
@ -27,7 +30,6 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
|
|||||||
import com.xjrsoft.module.mdm.dto.LngBRegionPageDto;
|
import com.xjrsoft.module.mdm.dto.LngBRegionPageDto;
|
||||||
import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto;
|
import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto;
|
||||||
import com.xjrsoft.module.mdm.entity.LngBRegion;
|
import com.xjrsoft.module.mdm.entity.LngBRegion;
|
||||||
import com.xjrsoft.module.mdm.enums.CountryRegionEnum;
|
|
||||||
import com.xjrsoft.module.mdm.service.ICountryRegionService;
|
import com.xjrsoft.module.mdm.service.ICountryRegionService;
|
||||||
import com.xjrsoft.module.mdm.vo.LngBRegionPageVo;
|
import com.xjrsoft.module.mdm.vo.LngBRegionPageVo;
|
||||||
import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo;
|
import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo;
|
||||||
@ -48,7 +50,7 @@ import lombok.AllArgsConstructor;
|
|||||||
* @Version 1.0
|
* @Version 1.0
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/mdm" + "/countryRegion")
|
@RequestMapping("/mdm/countryRegion")
|
||||||
@Api(value = "/mdm" + "/countryRegion",tags = "国家地区代码")
|
@Api(value = "/mdm" + "/countryRegion",tags = "国家地区代码")
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class CountryRegionController {
|
public class CountryRegionController {
|
||||||
@ -140,7 +142,7 @@ public class CountryRegionController {
|
|||||||
if(br.getPid() != null) {
|
if(br.getPid() != null) {
|
||||||
vo.setParentId(String.valueOf(br.getPid()) );
|
vo.setParentId(String.valueOf(br.getPid()) );
|
||||||
}else {
|
}else {
|
||||||
vo.setParentId("0");
|
vo.setParentId(String.valueOf(GlobalConstant.FIRST_NODE_VALUE));
|
||||||
}
|
}
|
||||||
|
|
||||||
voList.add(vo);
|
voList.add(vo);
|
||||||
@ -165,4 +167,19 @@ public class CountryRegionController {
|
|||||||
public R disable(@Valid @RequestBody List<Long> ids){
|
public R disable(@Valid @RequestBody List<Long> ids){
|
||||||
return R.ok(countryRegionService.disable(ids));
|
return R.ok(countryRegionService.disable(ids));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/child")
|
||||||
|
@ApiOperation(value = "根据id 查询下级区域")
|
||||||
|
public R getRegionByParentId(@RequestParam(required = false) Long pid, @RequestParam(required = false) String keyword) {
|
||||||
|
List<LngBRegion> regionList = countryRegionService.list(Wrappers.<LngBRegion>query().lambda()
|
||||||
|
.eq(pid != null, LngBRegion::getPid, pid)
|
||||||
|
.eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode())
|
||||||
|
.eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE)
|
||||||
|
.and(StrUtil.isNotBlank(keyword), x -> {
|
||||||
|
x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword);
|
||||||
|
}));
|
||||||
|
|
||||||
|
List<LngBRegionVo> resultList = BeanUtil.copyToList(regionList, LngBRegionVo.class);
|
||||||
|
return R.ok(resultList);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user