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

21
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/PubUtil.java
View File

@@ -2,6 +2,7 @@ package com.njcn.device.pms.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.njcn.system.pojo.po.DictData;
import lombok.SneakyThrows;
@@ -76,15 +77,17 @@ public class PubUtil {
}
public static String getDicById(String name, List<DictData> dictData) {
//先匹配有没有完全吻合的
List<DictData> compareDictDataList = dictData.stream().filter(x -> x.getName().equalsIgnoreCase(name)).collect(Collectors.toList());
if(CollUtil.isNotEmpty(compareDictDataList)){
return compareDictDataList.get(0).getId();
}
//如果没有匹配到，则判断是否有包含的
List<DictData> dictDataList = dictData.stream().filter(x -> x.getName().contains(name)).collect(Collectors.toList());
if (CollUtil.isNotEmpty(dictDataList)) {
return dictDataList.get(0).getId();
if(StrUtil.isNotBlank(name)){
//先匹配有没有完全吻合的
List<DictData> compareDictDataList = dictData.stream().filter(x -> x.getName().equalsIgnoreCase(name)).collect(Collectors.toList());
if(CollUtil.isNotEmpty(compareDictDataList)){
return compareDictDataList.get(0).getId();
}
//如果没有匹配到，则判断是否有包含的
List<DictData> dictDataList = dictData.stream().filter(x -> x.getName().contains(name)).collect(Collectors.toList());
if (CollUtil.isNotEmpty(dictDataList)) {
return dictDataList.get(0).getId();
}
}
//实在没有匹配到则返回空
return "";