wangrunpu
/
stm32-iot-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化 字典方法命名

Browse Source
master
疯狂的狮子Li 9 months ago
parent a93b30ec91
commit 460545a75e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
Unescape View File

@ -74,7 +74,7 @@ public interface DictService {
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典类型详细信息 * @return 字典类型详细信息
*/ */
DictTypeDTO getDictTypeDto(String dictType); DictTypeDTO getDictType(String dictType);
/** /**
* 根据字典类型查询字典数据列表 * 根据字典类型查询字典数据列表
@ -82,6 +82,6 @@ public interface DictService {
* @param dictType 字典类型 * @param dictType 字典类型
* @return 字典数据列表 * @return 字典数据列表
*/ */
List<DictDataDTO> getDictDataDto(String dictType); List<DictDataDTO> getDictData(String dictType);
} }

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
Unescape View File

@ -275,7 +275,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
* @return 字典类型详细信息 * @return 字典类型详细信息
*/ */
@Override @Override
public DictTypeDTO getDictTypeDto(String dictType) { public DictTypeDTO getDictType(String dictType) {
SysDictTypeVo vo = SpringUtils.getAopProxy(this).selectDictTypeByType(dictType); SysDictTypeVo vo = SpringUtils.getAopProxy(this).selectDictTypeByType(dictType);
return BeanUtil.toBean(vo, DictTypeDTO.class); return BeanUtil.toBean(vo, DictTypeDTO.class);
} }
@ -287,7 +287,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
* @return 字典数据列表 * @return 字典数据列表
*/ */
@Override @Override
public List<DictDataDTO> getDictDataDto(String dictType) { public List<DictDataDTO> getDictData(String dictType) {
List<SysDictDataVo> list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); List<SysDictDataVo> list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
return BeanUtil.copyToList(list, DictDataDTO.class); return BeanUtil.copyToList(list, DictDataDTO.class);
} }

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
Unescape View File

@ -147,7 +147,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService {
* @return 返回构建好的 ChildNode 对象 * @return 返回构建好的 ChildNode 对象
*/ */
private NodeExt.ChildNode buildChildNodeFromDict(String dictType) { private NodeExt.ChildNode buildChildNodeFromDict(String dictType) {
DictTypeDTO dictTypeDTO = dictService.getDictTypeDto(dictType); DictTypeDTO dictTypeDTO = dictService.getDictType(dictType);
if (ObjectUtil.isNull(dictTypeDTO)) { if (ObjectUtil.isNull(dictTypeDTO)) {
return null; return null;
} }
@ -159,7 +159,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService {
// 描述 // 描述
childNode.setDesc(dictTypeDTO.getRemark()); childNode.setDesc(dictTypeDTO.getRemark());
// 字典，下拉框和复选框时用到 // 字典，下拉框和复选框时用到
childNode.setDict(dictService.getDictDataDto(dictType) childNode.setDict(dictService.getDictData(dictType)
.stream().map(x -> .stream().map(x ->
new NodeExt.DictItem(x.getDictLabel(), x.getDictValue(), Convert.toBool(x.getIsDefault(), false)) new NodeExt.DictItem(x.getDictLabel(), x.getDictValue(), Convert.toBool(x.getIsDefault(), false))
).toList()); ).toList());

Write Preview
Loading…
Cancel
Save