WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-03-02 09:04:48 +08:00
parent 5466af90ad cafaa48f09
commit 459843076a
31 changed files with 849 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/pom.xml
+5
View File
@@ -107,6 +107,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
</dependencies>
</project>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+86 -19
View File
@@ -341,23 +341,68 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
*/
@Override
public List<Map<String, Object>> getInfoById(String id, String cut) {
//处理被代替标准
//根据代替标准查询被代替标准集合
List<Map<String, Object>> replaceStandardList = bussDocumentLibraryEOMapper.getInfoListByReplaceStandard(id);
List<String> replaceStandardNameList = new ArrayList<>();
for (Map<String, Object> map : replaceStandardList) {
String serialNumber = (String) map.get("serial_number");
replaceStandardNameList.add(serialNumber);
}
//区域管理
List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea());
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
//通过id查询数据
LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BussDocumentLibraryEO::getId, id);
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
//查询所有
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMaps(null);
//原始对应标准,代替标准,被代替标准(原始数据存的是iD)
String correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准
String replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准
//被代替标准
List<String> replacedStandardIdList = new ArrayList<>();//代替标准
//对应标准,代替标准,被代替标准对应的编码
List<String> correspondingStandardNameList = new ArrayList<>();//对应标准编码
List<String> replaceStandardNameList = new ArrayList<>();//代替标准编码
List<String> replacedStandardNameList = new ArrayList<>();//被代替标准编码
List<Map<String,Object>> listCorrespondingStandard = new ArrayList<>();
List<Map<String,Object>> listReplaceStandard = new ArrayList<>();
List<Map<String,Object>> listReplacedStandard = new ArrayList<>();
//处理被代替标准和对应标准
for (Map<String, Object> map : mapList) {
Map<String,Object> mapTemp = new HashMap<>();
//对应标准处理
if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) {
correspondingStandardNameList.add((String) map.get("serial_number"));
mapTemp.put("title",(String) map.get("serial_number"));
mapTemp.put("id",(String) map.get("id"));
if(ObjectUtils.isNotEmpty(mapTemp)){
listCorrespondingStandard.add(mapTemp);
}
}
//代替标准
if(StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))){
replaceStandardNameList.add((String) map.get("serial_number"));
mapTemp.put("title",(String) map.get("serial_number"));
mapTemp.put("id",(String) map.get("id"));
if(ObjectUtils.isNotEmpty(mapTemp)){
listReplaceStandard.add(mapTemp);
}
}
//被代替标准
String replaceStandard = (String) map.get("replace_standard");
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
replacedStandardIdList.add((String) map.get("id"));
String serialNumber = (String) map.get("serial_number");
replacedStandardNameList.add(serialNumber);
mapTemp.put("title",(String) map.get("serial_number"));
mapTemp.put("id",(String) map.get("id"));
if(ObjectUtils.isNotEmpty(mapTemp)){
listReplacedStandard.add(mapTemp);
}
}
}
//区域管理
List<OnlCgformArea> areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea());
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
//过滤出下拉选
List<OnlCgformField> onlCgformFieldList = fieldList.stream()
@@ -384,6 +429,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
List<Map<String, Object>> result = new ArrayList<>();
for (OnlCgformArea onlCgformAreaTemp : areaList) {
String areaName = "";
if (CutEnum.CN.getValue().equals(cut)) {
areaName = onlCgformAreaTemp.getShowArea();
} else {
areaName = onlCgformAreaTemp.getEnName();
}
Map<String, Object> mapTemp = new HashMap<>();
List<Map<String, Object>> resultTemp = new ArrayList<>();
List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
@@ -412,14 +463,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
for (OSSFile fileInfo : fileInfos) {
Map<String, Object> mapNew = new HashMap<>();
mapNew.put("value", fileInfo);
mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
resultTemp.add(mapNew);
}
}
} else if (fileInfos.size() == 1) {
//单个文件处理
map.put("value", fileInfos.get(0));
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
resultTemp.add(map);
}
}
@@ -428,21 +479,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (dataList.size() != 0) {
dataList.get(0).entrySet().forEach(entry -> {
if (onlCgformField.getDbFieldName().equals(entry.getKey())) {
if (onlCgformField.getDbFieldName().equals("replaced_standard")) {
if (onlCgformField.getDbFieldName().equals("replace_standard")) {
//代替标准
map.put("value", StringUtils.join(replaceStandardNameList, ","));
} else {
map.put("list",listReplaceStandard);
} else if(onlCgformField.getDbFieldName().equals("replaced_standard")){
//被代替标准
map.put("value", StringUtils.join(replacedStandardNameList, ","));
map.put("list",listReplacedStandard);
}else if(onlCgformField.getDbFieldName().equals("corresponding_standard")){
//对应标准
map.put("value", StringUtils.join(correspondingStandardNameList, ","));
map.put("list",listCorrespondingStandard);
}else {
map.put("value", entry.getValue());
}
}
});
}
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
}
if (map.size() != 0) {
resultTemp.add(map);
}
}
mapTemp.put(onlCgformAreaTemp.getShowArea(), resultTemp);
if (CutEnum.CN.getValue().equals(cut)) {
areaName = onlCgformAreaTemp.getShowArea();
mapTemp.put(areaName, resultTemp);
} else {
areaName = onlCgformAreaTemp.getEnName();
mapTemp.put(areaName, resultTemp);
}
result.add(mapTemp);
}
return result;