diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java index cd7822df..09c9b899 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java @@ -37,7 +37,7 @@ public class DictDetailController { @GetMapping public ResponseEntity> queryDictDetail(QueryDictDetailRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(dictDetailService.queryDictDetailPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(dictDetailService.describeDictDetailPage(criteria, page), HttpStatus.OK); } @ApiOperation("查询多个字典详情") @@ -46,7 +46,7 @@ public class DictDetailController { String[] names = dictName.split("[,,]"); Map> dictMap = new HashMap<>(16); for (String name : names) { - dictMap.put(name, dictDetailService.selectDictDetailByName(name)); + dictMap.put(name, dictDetailService.describeDictDetailListByName(name)); } return new ResponseEntity<>(dictMap, HttpStatus.OK); } @@ -63,7 +63,7 @@ public class DictDetailController { @PutMapping @PreAuthorize("@el.check('dict:edit')") public ResponseEntity updateDictDetail(@Validated(DictDetail.Update.class) @RequestBody DictDetail resources) { - dictDetailService.updateDictDetailById(resources); + dictDetailService.modifyDictDetailById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java index 0dddfed5..6466a698 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java @@ -23,7 +23,7 @@ public interface DictDetailService extends IService { * * @param resources / */ - void updateDictDetailById(DictDetail resources); + void modifyDictDetailById(DictDetail resources); /** * 删除 @@ -39,7 +39,7 @@ public interface DictDetailService extends IService { * @param page 分页参数 * @return / */ - PageResult queryDictDetailPage(QueryDictDetailRequest criteria, Page page); + PageResult describeDictDetailPage(QueryDictDetailRequest criteria, Page page); /** * 根据字典名称获取字典详情 @@ -47,5 +47,5 @@ public interface DictDetailService extends IService { * @param name 字典名称 * @return / */ - List selectDictDetailByName(String name); + List describeDictDetailListByName(String name); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java index 74777c6b..2ace27f7 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java @@ -29,7 +29,7 @@ public class DictDetailServiceImpl extends ServiceImpl queryDictDetailPage(QueryDictDetailRequest criteria, Page page) { + public PageResult describeDictDetailPage(QueryDictDetailRequest criteria, Page page) { return PageUtil.toPage(dictDetailMapper.queryDictDetailPageByArgs(criteria, page)); } @@ -45,7 +45,7 @@ public class DictDetailServiceImpl extends ServiceImpl selectDictDetailByName(String name) { + public List describeDictDetailListByName(String name) { String key = SystemRedisKey.DICT_NAME + name; List dictDetails = redisHelper.getList(key, DictDetail.class); if (CollUtil.isEmpty(dictDetails)) {