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

1.单位回显，时间范围查询等功能添加

Browse Source 
2.干扰源和敏感供用户模板下载和批量导入
3.增加根据code进行树形字典筛选
3.全景展示技术监督接口新增
This commit is contained in:
wr
2024-06-19 15:31:17 +08:00
parent b0fb724880
commit e54638425e
24 changed files with 1110 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-system/system-boot/Dockerfile
View File

@@ -1,15 +1,5 @@
FROM openjdk:8-jdk-alpine
FROM eclipse-temurin:8-jdk-ubi9-minimal
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
ADD target/systemboot.jar systemboot.jar
ENTRYPOINT ["java","-jar","/systemboot.jar"]
ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /systemboot.jar
EXPOSE 10207
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

10
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java
View File

@@ -90,6 +90,16 @@ public class DictTreeController extends BaseController {
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/queryByCodeList")
@ApiOperation("根据Code查询字典树")
public HttpResult<List<SysDicTreePO>> queryByCodeList(@RequestParam("code") String code) {
String methodDescribe = getMethodDescribe("queryByCodeList");
List<SysDicTreePO> result = sysDicTreePOService.queryByCodeList(code);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
@PostMapping("/queryByCode")
@ApiOperation("根据Code查询字典树")

59
pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java
View File

@@ -8,44 +8,53 @@ import com.njcn.system.pojo.vo.DictTreeVO;
import java.util.List;
/**
*
* Description:
* Date: 2023/6/9 14:00【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface SysDicTreePOService extends IService<SysDicTreePO>{
public interface SysDicTreePOService extends IService<SysDicTreePO> {
boolean addDictTree(DictTreeParam dictTreeParam);
boolean addDictTree(DictTreeParam dictTreeParam);
List<DictTreeVO> queryByPid(String pid);
List<DictTreeVO> queryByPid(String pid);
DictTreeVO queryByCode(String code);
DictTreeVO queryByCode(String code);
List<DictTreeVO> queryByid(String id);
List<DictTreeVO> queryByid(String id);
/**
* 根据id查询字典数据
* @param id
* @return
*/
SysDicTreePO queryById(String id);
/**
* 根据id查询字典数据
*
* @param id
* @return
*/
SysDicTreePO queryById(String id);
/**
* 查询所有树形字典
* @author cdf
* @date 2023/12/18
*/
List<SysDicTreePO> queryAll();
/**
* 查询所有树形字典
*
* @author cdf
* @date 2023/12/18
*/
List<SysDicTreePO> queryAll();
/**
* 分类查询所有树形字典
* @author cdf
* @date 2023/12/18
*/
List<SysDicTreePO> queryAllByType(Integer type);
/**
* 分类查询所有树形字典
*
* @author cdf
* @date 2023/12/18
*/
List<SysDicTreePO> queryAllByType(Integer type);
List<SysDicTreePO> queryTree();
List<SysDicTreePO> queryTree();
/**
* 根据code查询自动树
* @param code
* @return
*/
List<SysDicTreePO> queryByCodeList(String code);
}

48
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.njcn.system.pojo.param.DictTreeParam;
import com.njcn.system.pojo.vo.DictTreeVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -21,7 +22,6 @@ import com.njcn.system.service.SysDicTreePOService;
import org.springframework.transaction.annotation.Transactional;
/**
*
* Description:
* Date: 2023/6/9 14:00【需求编号】
*
@@ -29,23 +29,23 @@ import org.springframework.transaction.annotation.Transactional;
* @version V1.0.0
*/
@Service
public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, SysDicTreePO> implements SysDicTreePOService{
public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, SysDicTreePO> implements SysDicTreePOService {
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addDictTree(DictTreeParam dictTreeParam) {
SysDicTreePO sysDicTreePO = new SysDicTreePO();
BeanUtils.copyProperties(dictTreeParam, sysDicTreePO);
if(!Objects.equals(sysDicTreePO.getPid(), "0")){
if (!Objects.equals(sysDicTreePO.getPid(), "0")) {
QueryWrapper<SysDicTreePO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id", sysDicTreePO.getPid());
SysDicTreePO instance = this.baseMapper.selectOne(queryWrapper);
sysDicTreePO.setPids(instance.getPids()+","+instance.getId());
sysDicTreePO.setPids(instance.getPids() + "," + instance.getId());
}else{
} else {
sysDicTreePO.setPids("0");
}
sysDicTreePO.setStatus(0);
@@ -58,7 +58,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
public List<DictTreeVO> queryByPid(String pid) {
List<DictTreeVO> collect = new ArrayList<>();
LambdaQueryWrapper<SysDicTreePO> query = new LambdaQueryWrapper<>();
query.eq(SysDicTreePO::getPid, pid).eq(SysDicTreePO::getStatus,"0");
query.eq(SysDicTreePO::getPid, pid).eq(SysDicTreePO::getStatus, "0");
List<SysDicTreePO> resultList = this.list(query);
SysDicTreePO byId = this.getById(pid);
@@ -67,7 +67,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
collect = resultList.stream().map(temp -> {
DictTreeVO resultVO = new DictTreeVO();
BeanUtils.copyProperties(temp, resultVO);
resultVO.setPname(Objects.nonNull(byId)?byId.getName():"最高级");
resultVO.setPname(Objects.nonNull(byId) ? byId.getName() : "最高级");
return resultVO;
}).collect(Collectors.toList());
}
@@ -78,7 +78,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
public DictTreeVO queryByCode(String code) {
LambdaQueryWrapper<SysDicTreePO> query = new LambdaQueryWrapper<>();
query.clear();
query.eq(SysDicTreePO::getCode, code).eq(SysDicTreePO::getStatus,"0");
query.eq(SysDicTreePO::getCode, code).eq(SysDicTreePO::getStatus, "0");
SysDicTreePO result = this.getOne(query);
if (result != null) {
@@ -92,13 +92,13 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
@Override
public List<DictTreeVO> queryByid(String id) {
List<DictTreeVO> dictTreeVOS=this.baseMapper.queryByid(id);
List<DictTreeVO> dictTreeVOS = this.baseMapper.queryByid(id);
return dictTreeVOS;
}
@Override
public SysDicTreePO queryById(String id) {
return this.lambdaQuery().eq(SysDicTreePO::getId,id).eq(SysDicTreePO::getStatus,0).one();
return this.lambdaQuery().eq(SysDicTreePO::getId, id).eq(SysDicTreePO::getStatus, 0).one();
}
@Override
@@ -111,7 +111,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
@Override
public List<SysDicTreePO> queryAllByType(Integer type) {
LambdaQueryWrapper<SysDicTreePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0).eq(SysDicTreePO::getType,type);
lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0).eq(SysDicTreePO::getType, type);
return this.list(lambdaQueryWrapper);
}
@@ -119,14 +119,30 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
public List<SysDicTreePO> queryTree() {
LambdaQueryWrapper<SysDicTreePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0);
List<SysDicTreePO> sysDicTreePOList = this.list(lambdaQueryWrapper);
List<SysDicTreePO> parent = sysDicTreePOList.stream().filter(item->item.getPid().equals("0") && !item.getCode().equals("Device_Unit")).peek(item->{item.setLevel(0);item.setChildren(getChildren(item,sysDicTreePOList));}).collect(Collectors.toList());
return parent;
List<SysDicTreePO> sysDicTreePOList = this.list(lambdaQueryWrapper);
List<SysDicTreePO> parent = sysDicTreePOList.stream().filter(item -> item.getPid().equals("0") && !item.getCode().equals("Device_Unit")).peek(item -> {
item.setLevel(0);
item.setChildren(getChildren(item, sysDicTreePOList));
}).collect(Collectors.toList());
return parent;
}
@Override
public List<SysDicTreePO> queryByCodeList(String code) {
List<SysDicTreePO> sysDicTreePOList = this.list(new LambdaQueryWrapper<SysDicTreePO>().eq(SysDicTreePO::getStatus, 0));
List<SysDicTreePO> parent = sysDicTreePOList.stream().filter(item -> item.getCode().equals(code)).peek(item -> {
item.setLevel(0);
item.setChildren(getChildren(item, sysDicTreePOList));
}).collect(Collectors.toList());
return parent;
}
private List<SysDicTreePO> getChildren(SysDicTreePO sysDicTreePO,List<SysDicTreePO> all){
return all.stream().filter(item->item.getPid().equals(sysDicTreePO.getId())).peek(item->{item.setLevel(sysDicTreePO.getLevel()+1);item.setChildren(getChildren(item,all));}).collect(Collectors.toList());
private List<SysDicTreePO> getChildren(SysDicTreePO sysDicTreePO, List<SysDicTreePO> all) {
return all.stream().filter(item -> item.getPid().equals(sysDicTreePO.getId())).peek(item -> {
item.setLevel(sysDicTreePO.getLevel() + 1);
item.setChildren(getChildren(item, all));
}).collect(Collectors.toList());
}
}