Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-04-25 10:57:26 +08:00
parent 98e9f41758
commit 5b118aed7a
38 changed files with 1549 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java
View File

@@ -15,14 +15,13 @@ import com.njcn.system.pojo.param.AreaParam;
import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.vo.AreaTreeVO;
import com.njcn.system.service.IAreaService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List;
/**
@@ -273,5 +272,21 @@ public class AreaController extends BaseController {
Area result = areaService.areaDeptPro(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* @Description: 获取省市区下拉框
* @Param:
* @return:
* @Author: clam
* @Date: 2023/4/11
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/areaSelect")
@ApiOperation("获取省市区下拉框")
public HttpResult<List<AreaTreeVO>> areaSelect() {
String methodDescribe = getMethodDescribe("areaSelect");
List<AreaTreeVO> result = areaService.areaSelect();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

9
pqs-system/system-boot/src/main/java/com/njcn/system/service/IAreaService.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.system.pojo.dto.AreaTreeDTO;
import com.njcn.system.pojo.param.AreaParam;
import com.njcn.system.pojo.param.DictTypeParam;
import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.vo.AreaTreeVO;
@@ -105,4 +104,12 @@ public interface IAreaService extends IService<Area> {
* @return 行政区域详情
*/
Area selectAreaByName(String name);
/**
* @Description: areaSelect
* @Param: []
* @return: java.util.List<com.njcn.system.pojo.vo.AreaTreeVO>
* @Author: clam
* @Date: 2023/4/11
*/
List<AreaTreeVO> areaSelect();
}

16
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AreaServiceImpl.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.system.enums.SystemResponseEnum;
@@ -15,18 +16,14 @@ import com.njcn.system.pojo.param.AreaParam;
import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.vo.AreaTreeVO;
import com.njcn.system.service.IAreaService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -286,5 +283,16 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
}
}
@Override
public List<AreaTreeVO> areaSelect() {
List<AreaTreeVO> areaTreeVOS = this.baseMapper.getAreaAll();
List<AreaTreeVO> collect = areaTreeVOS.stream ( ).filter (temp ->"0".equals(temp.getPid()))
.map ((areaFirst) -> {
//map映射方法改变结果，调用getChildrens()方法，把一级部门deptFirst和所有数据allDept作为参数传递，查询所有下级部门
areaFirst.setChildren (getChildrens (areaFirst, areaTreeVOS));
return areaFirst;
}).collect (Collectors.toList ( ));
return collect;
}
}