diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java index 6f6a95b0..0a30229f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java @@ -34,14 +34,14 @@ public class DictController { @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") public void exportDict(HttpServletResponse response, QueryDictRequest criteria) throws IOException { - dictService.downloadExcel(dictService.selectDictByCriteria(criteria), response); + dictService.downloadDictExcel(dictService.describeDictList(criteria), response); } @ApiOperation("查询字典") @PostMapping(value = "/queryAllDict") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryAllDict() { - return new ResponseEntity<>(dictService.selectDictByCriteria(new QueryDictRequest()), HttpStatus.OK); + return new ResponseEntity<>(dictService.describeDictList(new QueryDictRequest()), HttpStatus.OK); } @ApiOperation("查询字典") @@ -49,14 +49,14 @@ public class DictController { @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryDict(QueryDictRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(dictService.queryDictPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(dictService.describeDictPage(criteria, page), HttpStatus.OK); } @ApiOperation("新增字典") @PostMapping(value = "/createDict") @PreAuthorize("@el.check('dict:add')") public ResponseEntity createDict(@Validated @RequestBody CreateDictRequest resources) { - dictService.saveDict(resources); + dictService.createDict(resources); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -64,7 +64,7 @@ public class DictController { @PostMapping(value = "/updateDict") @PreAuthorize("@el.check('dict:edit')") public ResponseEntity updateDict(@Validated(Dict.Update.class) @RequestBody Dict resources) { - dictService.updateDictById(resources); + dictService.modifyDictById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java index f2a93b19..62f35239 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java @@ -34,7 +34,7 @@ public class JobController { @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") public void exportJob(HttpServletResponse response, QueryJobRequest criteria) throws IOException { - jobService.downloadExcel(jobService.selectJobByCriteria(criteria), response); + jobService.downloadJobExcel(jobService.describeJobList(criteria), response); } @ApiOperation("查询岗位") @@ -42,7 +42,7 @@ public class JobController { @PreAuthorize("@el.check('job:list','user:list')") public ResponseEntity> queryJob(QueryJobRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); - return new ResponseEntity<>(jobService.queryJobPage(criteria, page), HttpStatus.OK); + return new ResponseEntity<>(jobService.describeJobPage(criteria, page), HttpStatus.OK); } @ApiOperation("新增岗位") @@ -57,7 +57,7 @@ public class JobController { @PostMapping(value = "/updateJob") @PreAuthorize("@el.check('job:edit')") public ResponseEntity updateJob(@Validated(Job.Update.class) @RequestBody Job resources) { - jobService.updateJobById(resources); + jobService.modifyJobById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java index f35ad1c2..ea0afbde 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java @@ -21,7 +21,7 @@ public interface DictService extends IService { * @param page 分页参数 * @return / */ - PageResult queryDictPage(QueryDictRequest criteria, Page page); + PageResult describeDictPage(QueryDictRequest criteria, Page page); /** * 查询全部数据 @@ -29,21 +29,21 @@ public interface DictService extends IService { * @param criteria / * @return / */ - List selectDictByCriteria(QueryDictRequest criteria); + List describeDictList(QueryDictRequest criteria); /** * 创建 * * @param resources / */ - void saveDict(CreateDictRequest resources); + void createDict(CreateDictRequest resources); /** * 编辑 * * @param resources / */ - void updateDictById(Dict resources); + void modifyDictById(Dict resources); /** * 删除 @@ -59,5 +59,5 @@ public interface DictService extends IService { * @param response / * @throws IOException / */ - void downloadExcel(List queryAll, HttpServletResponse response) throws IOException; + void downloadDictExcel(List queryAll, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java index 0010325e..5d561a73 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java @@ -20,7 +20,7 @@ public interface JobService extends IService { * @param id / * @return / */ - Job getJobById(Long id); + Job describeJobById(Long id); /** * 创建 @@ -34,7 +34,7 @@ public interface JobService extends IService { * * @param resources / */ - void updateJobById(Job resources); + void modifyJobById(Job resources); /** * 删除 @@ -50,7 +50,7 @@ public interface JobService extends IService { * @param page 分页参数 * @return / */ - PageResult queryJobPage(QueryJobRequest criteria, Page page); + PageResult describeJobPage(QueryJobRequest criteria, Page page); /** * 查询全部数据 @@ -58,7 +58,7 @@ public interface JobService extends IService { * @param criteria / * @return / */ - List selectJobByCriteria(QueryJobRequest criteria); + List describeJobList(QueryJobRequest criteria); /** * 导出数据 @@ -67,7 +67,7 @@ public interface JobService extends IService { * @param response / * @throws IOException / */ - void downloadExcel(List jobs, HttpServletResponse response) throws IOException; + void downloadJobExcel(List jobs, HttpServletResponse response) throws IOException; /** * 验证是否被用户关联 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java index ac2c139b..1599a977 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java @@ -36,25 +36,25 @@ public class DictServiceImpl extends ServiceImpl implements Di private final RedisHelper redisHelper; @Override - public PageResult queryDictPage(QueryDictRequest criteria, Page page) { + public PageResult describeDictPage(QueryDictRequest criteria, Page page) { IPage dicts = dictMapper.queryDictPageByArgs(criteria, page); return PageUtil.toPage(dicts); } @Override - public List selectDictByCriteria(QueryDictRequest criteria) { + public List describeDictList(QueryDictRequest criteria) { return dictMapper.queryDictPageByArgs(criteria, PageUtil.getCount(dictMapper)).getRecords(); } @Override @Transactional(rollbackFor = Exception.class) - public void saveDict(CreateDictRequest resources) { + public void createDict(CreateDictRequest resources) { save(BeanUtil.copyProperties(resources, Dict.class)); } @Override @Transactional(rollbackFor = Exception.class) - public void updateDictById(Dict resources) { + public void modifyDictById(Dict resources) { // 清理缓存 delCaches(resources); Dict dict = getById(resources.getId()); @@ -78,7 +78,7 @@ public class DictServiceImpl extends ServiceImpl implements Di } @Override - public void downloadExcel(List dicts, HttpServletResponse response) throws IOException { + public void downloadDictExcel(List dicts, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (Dict dict : dicts) { List dictDetails = dictDetailMapper.queryDictDetailListByDictName(dict.getName()); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java index 8c9c8cff..645da70c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java @@ -36,17 +36,17 @@ public class JobServiceImpl extends ServiceImpl implements JobSe private final RedisHelper redisHelper; @Override - public PageResult queryJobPage(QueryJobRequest criteria, Page page) { + public PageResult describeJobPage(QueryJobRequest criteria, Page page) { return PageUtil.toPage(jobMapper.queryJobPageByArgs(criteria, page)); } @Override - public List selectJobByCriteria(QueryJobRequest criteria) { + public List describeJobList(QueryJobRequest criteria) { return jobMapper.queryJobPageByArgs(criteria, PageUtil.getCount(jobMapper)).getRecords(); } @Override - public Job getJobById(Long id) { + public Job describeJobById(Long id) { String key = SystemRedisKey.JOB_ID + id; Job job = redisHelper.get(key, Job.class); if (job == null) { @@ -68,7 +68,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @Override @Transactional(rollbackFor = Exception.class) - public void updateJobById(Job resources) { + public void modifyJobById(Job resources) { Job job = getById(resources.getId()); Job old = jobMapper.getJobByName(resources.getName()); if (old != null && !old.getId().equals(resources.getId())) { @@ -89,7 +89,7 @@ public class JobServiceImpl extends ServiceImpl implements JobSe } @Override - public void downloadExcel(List jobs, HttpServletResponse response) throws IOException { + public void downloadJobExcel(List jobs, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (Job job : jobs) { Map map = new LinkedHashMap<>();