b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 调整下字典VO返回值命名

Browse Source
This commit is contained in:
b2baccline
2020-07-31 18:04:29 +08:00
parent 7464b31443
commit ad486b7e89
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java
View File

@@ -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<List<DictDataAndHashVO>> getDictDataAndHash(@RequestParam("dictCodes") String[] dictCodes) {
@GetMapping("/data")
public R<List<DictDataVO>> getDictData(@RequestParam("dictCodes") String[] dictCodes) {
return R.ok(sysDictManager.queryDictDataAndHashVO(dictCodes));
}

18
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java
View File

@@ -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<DictDataAndHashVO> queryDictDataAndHashVO(String[] dictCodes) {
List<DictDataAndHashVO> list = new ArrayList<>();
public List<DictDataVO> queryDictDataAndHashVO(String[] dictCodes) {
List<DictDataVO> list = new ArrayList<>();
// 查询对应hash值，以及字典项数据
List<SysDict> sysDictList = sysDictService.getByCode(dictCodes);
if (CollectionUtil.isNotEmpty(sysDictList)) {
for (SysDict sysDict : sysDictList) {
List<SysDictItem> dictItems = sysDictItemService.getByDictCode(sysDict.getCode());
// 排序并转换为VO
List<DictItemVO> dictList = dictItems.stream().sorted(Comparator.comparingInt(SysDictItem::getSort))
List<DictItemVO> 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;

6
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataAndHashVO.java → ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java
View File

@@ -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<DictItemVO> dictList;
@ApiModelProperty(value = "字典项列表")
private List<DictItemVO> dictItems;
}