diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java index 4d78d4e1..4009d75f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java @@ -6,7 +6,7 @@ import com.hccake.ballcat.admin.modules.sys.manager.SysDictManager; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataAndHashVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -40,8 +40,8 @@ public class SysDictController { * @param dictCodes 字典标识列表 * @return 同类型字典 */ - @GetMapping("/data-hash") - public R> getDictDataAndHash(@RequestParam("dictCodes") String[] dictCodes) { + @GetMapping("/data") + public R> getDictData(@RequestParam("dictCodes") String[] dictCodes) { return R.ok(sysDictManager.queryDictDataAndHashVO(dictCodes)); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java index 1ae50047..574cfe6a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java @@ -9,7 +9,7 @@ import com.hccake.ballcat.admin.modules.sys.model.converter.SysDictConverter; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataAndHashVO; +import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO; import com.hccake.ballcat.admin.modules.sys.model.vo.DictItemVO; import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService; import com.hccake.ballcat.admin.modules.sys.service.SysDictService; @@ -160,23 +160,23 @@ public class SysDictManager { * @param dictCodes 字典标识 * @return DictDataAndHashVO */ - public List queryDictDataAndHashVO(String[] dictCodes) { - List list = new ArrayList<>(); + public List queryDictDataAndHashVO(String[] dictCodes) { + List list = new ArrayList<>(); // 查询对应hash值,以及字典项数据 List sysDictList = sysDictService.getByCode(dictCodes); if (CollectionUtil.isNotEmpty(sysDictList)) { for (SysDict sysDict : sysDictList) { List dictItems = sysDictItemService.getByDictCode(sysDict.getCode()); // 排序并转换为VO - List dictList = dictItems.stream().sorted(Comparator.comparingInt(SysDictItem::getSort)) + List setDictItems = dictItems.stream().sorted(Comparator.comparingInt(SysDictItem::getSort)) .map(SysDictConverter.INSTANCE::itemPoToVo).collect(Collectors.toList()); // 组装DataVO - DictDataAndHashVO dictDataAndHashVO = new DictDataAndHashVO(); - dictDataAndHashVO.setDictCode(sysDict.getCode()); - dictDataAndHashVO.setHashCode(sysDict.getHashCode()); - dictDataAndHashVO.setDictList(dictList); + DictDataVO dictDataVO = new DictDataVO(); + dictDataVO.setDictCode(sysDict.getCode()); + dictDataVO.setHashCode(sysDict.getHashCode()); + dictDataVO.setDictItems(setDictItems); - list.add(dictDataAndHashVO); + list.add(dictDataVO); } } return list; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataAndHashVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java similarity index 82% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataAndHashVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java index 16592818..f65c7017 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataAndHashVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java @@ -13,7 +13,7 @@ import java.util.List; */ @Data @ApiModel(value = "字典数据VO") -public class DictDataAndHashVO { +public class DictDataVO { /** * 字典标识 @@ -30,7 +30,7 @@ public class DictDataAndHashVO { /** * 字典项列表 */ - @ApiModelProperty(value = "字典数据") - private List dictList; + @ApiModelProperty(value = "字典项列表") + private List dictItems; }