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

部门单位修改接口新增

Browse Source
This commit is contained in:
雨木c
2023-10-25 16:54:20 +08:00
parent b6968824f0
commit 06822c414f
7 changed files with 94 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,5 +288,25 @@ public class AreaController extends BaseController {
List<AreaTreeVO> result = areaService.areaSelect();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 获取指定区域父级的子级区域集合
* @author cdf
* @date 2023/10/25
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getPidAreaList")
@ApiOperation("获取指定区域父级的子级区域集合")
@ApiImplicitParams({
@ApiImplicitParam(name = "areaId",value = "区域id"),
@ApiImplicitParam(name = "type", value = "区域类型", required = true)
})
public HttpResult<List<Area>> getPidAreaList(@RequestParam("areaId")String areaId , @RequestParam("type") Integer type) {
String methodDescribe = getMethodDescribe("getPidAreaList");
List<Area> result = areaService.getPidAreaList(areaId,type);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

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

@@ -104,12 +104,14 @@ public interface IAreaService extends IService<Area> {
* @return 行政区域详情
*/
Area selectAreaByName(String name);
/**
* @Description: areaSelect
* @Param: []
* @return: java.util.List<com.njcn.system.pojo.vo.AreaTreeVO>
/**
* @Description: areaSelect
* @Param: []
* @return: java.util.List<com.njcn.system.pojo.vo.AreaTreeVO>
* @Author: clam
* @Date: 2023/4/11
*/
* @Date: 2023/4/11
*/
List<AreaTreeVO> areaSelect();
List<Area> getPidAreaList(String areaId,Integer type);
}

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -213,7 +214,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
area = areaPro(id, type);
}
return area;
}
}
@Override
public Area areaDeptPro(String id) {
@@ -295,4 +296,22 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
return collect;
}
@Override
public List<Area> getPidAreaList(String areaId, Integer type) {
List<Area> result = new ArrayList<>();
Area area = this.getById(areaId);
if(Objects.isNull(area)){
return result;
}
if(area.getPid().equals("-1")){
result.add(area);
}else {
LambdaQueryWrapper<Area> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Area::getPid,area.getPid())
.eq(Area::getState,DataStateEnum.ENABLE.getCode()).eq(Area::getType,type).orderByAsc(Area::getAreaCode);
result = this.list(lambdaQueryWrapper);
}
return result;
}
}

15
pqs-user/user-boot/Dockerfile
View File

@@ -1,12 +1,5 @@
FROM eclipse-temurin:8-jdk-centos7
MAINTAINER hongawen_13914774158@163.com
ENV JAVA_OPTS="-Xms1024m -Xmx1024m"
# 挂载时区的目录
VOLUME /usr/share/zoneinfo
# 设置时区为上海
ENV TZ=Asia/Shanghai
# 设置时区信息
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
FROM openjdk:8-jdk-alpine
ADD target/userboot.jar userboot.jar
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /userboot.jar
EXPOSE 10201
ENTRYPOINT ["java","-jar","/userboot.jar"]
EXPOSE 10201
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

25
pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
View File

@@ -11,6 +11,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.system.pojo.dto.AreaTreeDTO;
import com.njcn.system.pojo.po.Area;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.user.pojo.param.DeptParam;
import com.njcn.user.pojo.po.Dept;
@@ -80,6 +81,29 @@ public class DeptController extends BaseController {
}
}
/**
* 根据部门区域id获取父级部门下级所有区域
* @author cdf
* @date 2023/10/25
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getPidAreaByAreaId")
@ApiOperation("查询区域树")
@ApiImplicitParams({
@ApiImplicitParam(name = "id",value = "区域id"),
@ApiImplicitParam(name = "type", value = "区域类型", required = true)
})
public HttpResult<List<Area>> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
String methodDescribe = getMethodDescribe("getAreaTree");
List<Area> result = deptService.getPidAreaByAreaId(id,type);
if (!result.isEmpty()) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}
/**
* 新增部门
*
@@ -166,7 +190,6 @@ public class DeptController extends BaseController {
if (!result.isEmpty()) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
}
}

4
pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
View File

@@ -3,6 +3,7 @@ package com.njcn.user.service;
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.po.Area;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.user.pojo.param.DeptParam;
import com.njcn.user.pojo.po.Dept;
@@ -82,6 +83,9 @@ public interface IDeptService extends IService<Dept> {
*/
List<AreaTreeDTO> getAreaTree(String id, Integer type);
List<Area> getPidAreaByAreaId(String id, Integer type);
/**
* 获取省份ids
* @param ids ids

14
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.njcn.device.biz.commApi.CommLedgerDeptClient;
import com.njcn.device.pq.api.DeptLineFeignClient;
import com.njcn.system.api.AreaFeignClient;
import com.njcn.system.pojo.dto.AreaTreeDTO;
import com.njcn.system.pojo.po.Area;
import com.njcn.user.enums.UserResponseEnum;
import com.njcn.user.enums.UserStatusEnum;
import com.njcn.user.mapper.DeptMapper;
@@ -212,6 +213,19 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
return list;
}
@Override
public List<Area> getPidAreaByAreaId(String id, Integer type) {
List<String> deptBindAreaList = deptArea();
List<Area> areaList = areaFeignClient.getPidAreaList(id, type).getData();
areaList = areaList.stream().peek(item->{
if(deptBindAreaList.contains(item.getId())){
item.setName(item.getName() + "(已被绑定)");
}
}).collect(Collectors.toList());
return areaList;
}
@Override
public boolean selectPid(List<String> ids) {
/**