From 5a988b31150ce19b0f0f990e34c2b3b29adb642f Mon Sep 17 00:00:00 2001 From: liao Date: Mon, 18 Sep 2023 15:55:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=BF=94=E5=9B=9E=E5=80=BC=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index aafe7f11..30c85e99 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -145,17 +145,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 对返回的数据做处理（详情页） **/ private Map processResultMap(Map initMap, List fieldList) { - // 字典类型 - List dictTag = fieldList.stream().filter(lawsTag -> - FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())).collect(Collectors.toList()); - // 字典配置项 - List dictItemList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(dictTag)) { - List dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDictItem::getDictId, dictIdList); - dictItemList = sysDictItemService.list(queryWrapper); - } + List dictItemList = getDictItemList(fieldList); Map resultMap = new LinkedHashMap<>(); for (Map.Entry entryMap : initMap.entrySet()) { String key = entryMap.getKey(); @@ -163,6 +153,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { if (!Objects.isNull(entryMap.getValue())) { value = (String) entryMap.getValue(); } + // 原始键值对 resultMap.put(key, value); // 如果value不为null和""，对返回结果做处理 if (StringUtils.isNotBlank(value)) { @@ -179,17 +170,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 对返回的数据做处理（列表显示） **/ private List> processResultMapPageList(List> records, List fieldList) { - // 字典类型 - List dictTag = fieldList.stream().filter(lawsTag -> - FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())).collect(Collectors.toList()); - // 字典配置项 - List dictItemList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(dictTag)) { - List dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDictItem::getDictId, dictIdList); - dictItemList = sysDictItemService.list(queryWrapper); - } + List dictItemList = getDictItemList(fieldList); List> resultMapList = new ArrayList<>(); for (Map map : records) { Map resultMap = new LinkedHashMap<>(); @@ -199,6 +180,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { if (!Objects.isNull(entryMap.getValue())) { value = (String) entryMap.getValue(); } + // 原始键值对 resultMap.put(key, value); // 如果value不为null和""，对返回结果做处理 if (StringUtils.isNotBlank(value)) { @@ -211,10 +193,30 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return resultMapList; } + /** + * @Author: liao + * @Date: 2023/9/18 15:52 + * @Description: 获取字典翻译 + **/ + private List getDictItemList(List fieldList) { + // 字典类型 + List dictTag = fieldList.stream().filter(lawsTag -> + FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())).collect(Collectors.toList()); + // 字典配置项 + List dictItemList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(dictTag)) { + List dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SysDictItem::getDictId, dictIdList); + dictItemList = sysDictItemService.list(queryWrapper); + } + return dictItemList; + } + /** * @Author: liao * @Date: 2023/8/25 11:55 - * @Description: 对返回的字段值做处理（详情页） + * @Description: 对返回的字段值做处理 **/ private void processResultFieldValue(String key, String value, List fieldList, Map resultMap, List dictItemList) { @@ -226,7 +228,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { resultMap.put(key, StringUtils.join(valueList.stream() .distinct().collect(Collectors.toList()), ",")); } else if (LawsFieldTypeEnum.USER_SINGLE.getValue().equals(lawsTag.getFieldShowType())) { - // 如果是用户弹框，做翻译 + // 如果是用户弹框，做翻译（详情页展示，如果列表展示则重写一下） LambdaQueryWrapper sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysUserLambdaQueryWrapper.in(SysUser::getId, valueList); List userList = sysUserService.list(sysUserLambdaQueryWrapper); @@ -234,14 +236,14 @@ public class LawsCommonServiceImpl implements ILawsCommonService { resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ",")); } else if (LawsFieldTypeEnum.GROUP_SINGLE.getValue().equals(lawsTag.getFieldShowType()) || LawsFieldTypeEnum.GROUP_MANY.getValue().equals(lawsTag.getFieldShowType())) { - // 如果是组织机构弹框 + // 如果是组织机构弹框（详情页展示，如果列表展示则重写一下） LambdaQueryWrapper sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysDepartLambdaQueryWrapper.in(SysDepart::getId, valueList); List departList = sysDepartService.list(sysDepartLambdaQueryWrapper); List nameList = departList.stream().map(SysDepart::getDepartName).collect(Collectors.toList()); resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ",")); } else if (LawsFieldTypeEnum.FILE_UP.getValue().equals(lawsTag.getFieldShowType())) { - // 如果是文件上传 + // 如果是文件上传（详情页展示，如果列表展示则重写一下） LambdaQueryWrapper ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); ossFileLambdaQueryWrapper.in(OSSFile::getId, valueList); List fileList = ossFileService.list(ossFileLambdaQueryWrapper);