update 返回值翻译
This commit is contained in:
+28
-26
@@ -145,17 +145,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
||||
* @Description: 对返回的数据做处理(详情页)
|
||||
**/
|
||||
private Map<String, Object> processResultMap(Map<String, Object> initMap, List<LawsTag> fieldList) {
|
||||
// 字典类型
|
||||
List<LawsTag> dictTag = fieldList.stream().filter(lawsTag ->
|
||||
FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())).collect(Collectors.toList());
|
||||
// 字典配置项
|
||||
List<SysDictItem> dictItemList = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(dictTag)) {
|
||||
List<String> dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.in(SysDictItem::getDictId, dictIdList);
|
||||
dictItemList = sysDictItemService.list(queryWrapper);
|
||||
}
|
||||
List<SysDictItem> dictItemList = getDictItemList(fieldList);
|
||||
Map<String, Object> resultMap = new LinkedHashMap<>();
|
||||
for (Map.Entry<String, Object> 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<Map<String, Object>> processResultMapPageList(List<Map<String, Object>> records, List<LawsTag> fieldList) {
|
||||
// 字典类型
|
||||
List<LawsTag> dictTag = fieldList.stream().filter(lawsTag ->
|
||||
FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())).collect(Collectors.toList());
|
||||
// 字典配置项
|
||||
List<SysDictItem> dictItemList = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(dictTag)) {
|
||||
List<String> dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.in(SysDictItem::getDictId, dictIdList);
|
||||
dictItemList = sysDictItemService.list(queryWrapper);
|
||||
}
|
||||
List<SysDictItem> dictItemList = getDictItemList(fieldList);
|
||||
List<Map<String, Object>> resultMapList = new ArrayList<>();
|
||||
for (Map<String, Object> map : records) {
|
||||
Map<String, Object> 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<SysDictItem> getDictItemList(List<LawsTag> fieldList) {
|
||||
// 字典类型
|
||||
List<LawsTag> dictTag = fieldList.stream().filter(lawsTag ->
|
||||
FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())).collect(Collectors.toList());
|
||||
// 字典配置项
|
||||
List<SysDictItem> dictItemList = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(dictTag)) {
|
||||
List<String> dictIdList = dictTag.stream().map(LawsTag::getDictId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<SysDictItem> 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<LawsTag> fieldList,
|
||||
Map<String, Object> resultMap, List<SysDictItem> 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<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
sysUserLambdaQueryWrapper.in(SysUser::getId, valueList);
|
||||
List<SysUser> 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<SysDepart> sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
sysDepartLambdaQueryWrapper.in(SysDepart::getId, valueList);
|
||||
List<SysDepart> departList = sysDepartService.list(sysDepartLambdaQueryWrapper);
|
||||
List<String> 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<OSSFile> ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
ossFileLambdaQueryWrapper.in(OSSFile::getId, valueList);
|
||||
List<OSSFile> fileList = ossFileService.list(ossFileLambdaQueryWrapper);
|
||||
|
||||
Reference in New Issue
Block a user