diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java index 14f1e9b9..9f8d6f0c 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QueryQuartzJobRequest.java @@ -7,7 +7,7 @@ import java.util.List; @Data -public class QuartzJobQueryCriteria { +public class QueryQuartzJobRequest { @ApiModelProperty(value = "定时任务名称") private String jobName; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java index a1b97827..7e2aa5a9 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDeptRequest.java @@ -6,7 +6,7 @@ import java.sql.Timestamp; import java.util.List; @Data -public class DeptQueryCriteria { +public class QueryDeptRequest { @ApiModelProperty(value = "部门id集合") private List ids; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictDetailQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java similarity index 91% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictDetailQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java index c17b3388..5e1715c8 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictDetailQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictDetailRequest.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class DictDetailQueryCriteria { +public class QueryDictDetailRequest { @ApiModelProperty(value = "标签") private String label; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java similarity index 91% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java index 67d731fe..95acabe1 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryDictRequest.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class DictQueryCriteria { +public class QueryDictRequest { @ApiModelProperty(value = "模糊查询") private String blurry; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java index 42cff44f..3d1e8230 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryJobRequest.java @@ -9,7 +9,7 @@ import java.util.List; @Data @NoArgsConstructor -public class JobQueryCriteria { +public class QueryJobRequest { @ApiModelProperty(value = "岗位名称") private String name; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java index cc39378c..d43dbdbb 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryMenuRequest.java @@ -7,7 +7,7 @@ import java.util.List; @Data -public class MenuQueryCriteria { +public class QueryMenuRequest { @ApiModelProperty(value = "模糊查询") private String blurry; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java index 58150dc8..142ad6d0 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryRoleRequest.java @@ -7,7 +7,7 @@ import java.util.List; @Data -public class RoleQueryCriteria { +public class QueryRoleRequest { @ApiModelProperty(value = "模糊查询") private String blurry; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java index 9f4858c0..2aec7b31 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/QueryUserRequest.java @@ -11,7 +11,7 @@ import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) -public class UserQueryCriteria extends MyObject { +public class QueryUserRequest extends MyObject { @ApiModelProperty(value = "ID") private Long id; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaResponse.java similarity index 90% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaResponse.java index 5a8f0bf5..68224979 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaResponse.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class MenuMetaVo extends MyObject { +public class MenuMetaResponse extends MyObject { @ApiModelProperty(value = "菜单标题") private String title; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java similarity index 86% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java index 706de60d..4b9fcd3b 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuResponse.java @@ -11,7 +11,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = false) -public class MenuVo extends MyObject { +public class MenuResponse extends MyObject { @ApiModelProperty(value = "菜单名称") private String name; @@ -32,8 +32,8 @@ public class MenuVo extends MyObject { private Boolean alwaysShow; @ApiModelProperty(value = "元数据") - private MenuMetaVo meta; + private MenuMetaResponse meta; @ApiModelProperty(value = "子路由") - private List children; + private List children; } diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserResponse.java similarity index 96% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserResponse.java index af860823..839f8c09 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserResponse.java @@ -12,7 +12,7 @@ import java.util.Set; @Data @EqualsAndHashCode(callSuper = false) -public class SimpleUserVo extends MyObject { +public class SimpleUserResponse extends MyObject { @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(value = "用户角色") diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java similarity index 85% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java index 332177a9..b557b811 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoResponse.java @@ -10,8 +10,8 @@ import java.util.stream.Collectors; @Data @EqualsAndHashCode(callSuper = false) -public class UserInfoVo extends MyObject { - private SimpleUserVo user; +public class UserInfoResponse extends MyObject { + private SimpleUserResponse user; private List dataScopes; private List authorities; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassResponse.java similarity index 89% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassResponse.java index 242f721a..b5fa00fc 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassResponse.java @@ -7,7 +7,7 @@ import lombok.Data; * 修改密码 */ @Data -public class UserPassVo { +public class UserPassResponse { @ApiModelProperty(value = "旧密码") private String oldPass; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java index 00b10dc1..4e5218c1 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryLocalStorageRequest.java @@ -7,7 +7,7 @@ import java.util.List; @Data -public class LocalStorageQueryCriteria { +public class QueryLocalStorageRequest { @ApiModelProperty(value = "模糊查询") private String blurry; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java index ba3d5919..0d2c71c7 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QueryQiniuRequest.java @@ -7,7 +7,7 @@ import java.util.List; @Data -public class QiniuQueryCriteria { +public class QueryQiniuRequest { @ApiModelProperty(value = "名称查询") private String key; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java similarity index 89% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java index 527d3926..eae21867 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/EmailDto.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/SendEmailRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.dto; +package cn.odboy.model.tools.request; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -14,7 +14,7 @@ import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor -public class EmailDto { +public class SendEmailRequest { @NotEmpty @ApiModelProperty(value = "收件人") diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java index 28ae8f51..9a947618 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/ExecutionJob.java @@ -11,7 +11,7 @@ import cn.odboy.application.tools.service.EmailService; import cn.odboy.context.SpringBeanHolder; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.tools.dto.EmailDto; +import cn.odboy.model.tools.request.SendEmailRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.StringUtil; import lombok.extern.slf4j.Slf4j; @@ -89,8 +89,8 @@ public class ExecutionJob extends QuartzJobBean { EmailService emailService = SpringBeanHolder.getBean(EmailService.class); // 邮箱报警 if (StringUtil.isNoneBlank(quartzJob.getEmail())) { - EmailDto emailDto = taskAlarm(quartzJob, ExceptionUtil.stacktraceToString(e)); - emailService.sendEmail(emailDto); + SendEmailRequest sendEmailRequest = taskAlarm(quartzJob, ExceptionUtil.stacktraceToString(e)); + emailService.sendEmail(sendEmailRequest); } } } finally { @@ -98,17 +98,17 @@ public class ExecutionJob extends QuartzJobBean { } } - private EmailDto taskAlarm(QuartzJob quartzJob, String msg) { - EmailDto emailDto = new EmailDto(); - emailDto.setSubject("定时任务【" + quartzJob.getJobName() + "】执行失败，请尽快处理！"); + private SendEmailRequest taskAlarm(QuartzJob quartzJob, String msg) { + SendEmailRequest sendEmailRequest = new SendEmailRequest(); + sendEmailRequest.setSubject("定时任务【" + quartzJob.getJobName() + "】执行失败，请尽快处理！"); Map data = new HashMap<>(16); data.put("task", quartzJob); data.put("msg", msg); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); Template template = engine.getTemplate("taskAlarm.ftl"); - emailDto.setContent(template.render(data)); + sendEmailRequest.setContent(template.render(data)); List emails = Arrays.asList(quartzJob.getEmail().split("[,，]")); - emailDto.setTos(emails); - return emailDto; + sendEmailRequest.setTos(emails); + return sendEmailRequest; } } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java index 3856e671..d3aac0ce 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.job.mapper; import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.request.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QueryQuartzJobRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,7 +11,7 @@ import java.util.List; @Mapper public interface QuartzJobMapper extends BaseMapper { - IPage queryQuartzJobPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); + IPage queryQuartzJobPage(@Param("criteria") QueryQuartzJobRequest criteria, Page page); List selectActiveQuartzJob(); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java index 3f76cd77..f55e1089 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.job.mapper; import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.request.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QueryQuartzJobRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface QuartzLogMapper extends BaseMapper { - IPage queryQuartzLogPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page page); + IPage queryQuartzLogPage(@Param("criteria") QueryQuartzJobRequest criteria, Page page); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java index f6b39a9e..c173605f 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java @@ -7,7 +7,7 @@ import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; import cn.odboy.model.job.request.UpdateQuartzJobRequest; -import cn.odboy.model.job.request.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QueryQuartzJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -43,7 +43,7 @@ public class QuartzJobController { @ApiOperation("查询定时任务") @GetMapping @PreAuthorize("@el.check('timing:list')") - public ResponseEntity> queryQuartzJob(QuartzJobQueryCriteria criteria) { + public ResponseEntity> queryQuartzJob(QueryQuartzJobRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(quartzJobService.queryJobPage(criteria, page), HttpStatus.OK); } @@ -51,21 +51,21 @@ public class QuartzJobController { @ApiOperation("导出任务数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('timing:list')") - public void exportQuartzJob(HttpServletResponse response, QuartzJobQueryCriteria criteria) throws IOException { + public void exportQuartzJob(HttpServletResponse response, QueryQuartzJobRequest criteria) throws IOException { quartzJobService.downloadJobExcel(quartzJobService.selectJobByCriteria(criteria), response); } @ApiOperation("导出日志数据") @GetMapping(value = "/logs/download") @PreAuthorize("@el.check('timing:list')") - public void exportQuartzJobLog(HttpServletResponse response, QuartzJobQueryCriteria criteria) throws IOException { + public void exportQuartzJobLog(HttpServletResponse response, QueryQuartzJobRequest criteria) throws IOException { quartzJobService.downloadLogExcel(quartzJobService.selectLogByCriteria(criteria), response); } @ApiOperation("查询任务执行日志") @GetMapping(value = "/logs") @PreAuthorize("@el.check('timing:list')") - public ResponseEntity> queryQuartzJobLog(QuartzJobQueryCriteria criteria) { + public ResponseEntity> queryQuartzJobLog(QueryQuartzJobRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(quartzJobService.queryLogPage(criteria, page), HttpStatus.OK); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java index eda02eed..beb92287 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java @@ -4,7 +4,7 @@ import cn.odboy.base.PageResult; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; import cn.odboy.model.job.request.UpdateQuartzJobRequest; -import cn.odboy.model.job.request.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QueryQuartzJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; @@ -22,7 +22,7 @@ public interface QuartzJobService extends IService { * @param page 分页参数 * @return / */ - PageResult queryJobPage(QuartzJobQueryCriteria criteria, Page page); + PageResult queryJobPage(QueryQuartzJobRequest criteria, Page page); /** * 查询全部 @@ -30,7 +30,7 @@ public interface QuartzJobService extends IService { * @param criteria 条件 * @return / */ - List selectJobByCriteria(QuartzJobQueryCriteria criteria); + List selectJobByCriteria(QueryQuartzJobRequest criteria); /** * 分页查询日志 @@ -39,7 +39,7 @@ public interface QuartzJobService extends IService { * @param page 分页参数 * @return / */ - PageResult queryLogPage(QuartzJobQueryCriteria criteria, Page page); + PageResult queryLogPage(QueryQuartzJobRequest criteria, Page page); /** * 查询全部 @@ -47,7 +47,7 @@ public interface QuartzJobService extends IService { * @param criteria 条件 * @return / */ - List selectLogByCriteria(QuartzJobQueryCriteria criteria); + List selectLogByCriteria(QueryQuartzJobRequest criteria); /** * 创建 diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java index 378663d6..9181e161 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java @@ -12,7 +12,7 @@ import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; import cn.odboy.model.job.request.UpdateQuartzJobRequest; -import cn.odboy.model.job.request.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QueryQuartzJobRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; @@ -42,22 +42,22 @@ public class QuartzJobServiceImpl extends ServiceImpl queryJobPage(QuartzJobQueryCriteria criteria, Page page) { + public PageResult queryJobPage(QueryQuartzJobRequest criteria, Page page) { return PageUtil.toPage(quartzJobMapper.queryQuartzJobPage(criteria, page)); } @Override - public PageResult queryLogPage(QuartzJobQueryCriteria criteria, Page page) { + public PageResult queryLogPage(QueryQuartzJobRequest criteria, Page page) { return PageUtil.toPage(quartzLogMapper.queryQuartzLogPage(criteria, page)); } @Override - public List selectJobByCriteria(QuartzJobQueryCriteria criteria) { + public List selectJobByCriteria(QueryQuartzJobRequest criteria) { return quartzJobMapper.queryQuartzJobPage(criteria, PageUtil.getCount(quartzJobMapper)).getRecords(); } @Override - public List selectLogByCriteria(QuartzJobQueryCriteria criteria) { + public List selectLogByCriteria(QueryQuartzJobRequest criteria) { return quartzLogMapper.queryQuartzLogPage(criteria, PageUtil.getCount(quartzLogMapper)).getRecords(); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java index a49ad41f..9eeac2f4 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java @@ -17,7 +17,7 @@ import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.dto.UserJwtDto; import cn.odboy.model.system.request.UserLoginRequest; -import cn.odboy.model.system.response.UserInfoVo; +import cn.odboy.model.system.response.UserInfoResponse; import cn.odboy.properties.RsaProperties; import cn.odboy.redis.RedisHelper; import cn.odboy.util.RsaEncryptUtil; @@ -88,7 +88,7 @@ public class AuthController { // 返回 token 与 用户信息 Map authInfo = new HashMap<>(2) {{ put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); - put("user", BeanUtil.copyProperties(jwtUser, UserInfoVo.class)); + put("user", BeanUtil.copyProperties(jwtUser, UserInfoResponse.class)); }}; if (loginProperties.isSingleLogin()) { // 踢掉之前已经登录的token @@ -102,10 +102,10 @@ public class AuthController { @ApiOperation("获取用户信息") @GetMapping(value = "/info") - public ResponseEntity getUserInfo() { + public ResponseEntity getUserInfo() { UserJwtDto jwtUser = (UserJwtDto) SecurityHelper.getCurrentUser(); - UserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, UserInfoVo.class); - return ResponseEntity.ok(userInfoVo); + UserInfoResponse userInfoResponse = BeanUtil.copyProperties(jwtUser, UserInfoResponse.class); + return ResponseEntity.ok(userInfoResponse); } @ApiOperation("获取验证码") diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java index 9f0a40db..68c22ba9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.QueryDeptRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -10,7 +10,7 @@ import java.util.Set; @Mapper public interface DeptMapper extends BaseMapper { - List selectDeptByCriteria(@Param("criteria") DeptQueryCriteria criteria); + List selectDeptByCriteria(@Param("criteria") QueryDeptRequest criteria); List selectDeptByPid(@Param("pid") Long pid); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java index 0c413264..c91685cf 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.QueryDictDetailRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,7 +15,7 @@ import java.util.Set; public interface DictDetailMapper extends BaseMapper { List selectDictDetailByDictName(@Param("name") String name); - IPage queryDictDetail(@Param("criteria") DictDetailQueryCriteria criteria, Page page); + IPage queryDictDetail(@Param("criteria") QueryDictDetailRequest criteria, Page page); void deleteDictDetailsByDictIds(@Param("dictIds") Set dictIds); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java index 3784d254..a4fe6044 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.request.DictQueryCriteria; +import cn.odboy.model.system.request.QueryDictRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DictMapper extends BaseMapper { - IPage queryDictPage(@Param("criteria") DictQueryCriteria criteria, Page page); + IPage queryDictPage(@Param("criteria") QueryDictRequest criteria, Page page); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java index 1083e2d7..842535b8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.QueryJobRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Param; public interface JobMapper extends BaseMapper { Job getJobByName(@Param("name") String name); - IPage queryJobPage(@Param("criteria") JobQueryCriteria criteria, Page page); + IPage queryJobPage(@Param("criteria") QueryJobRequest criteria, Page page); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java index d8631276..d42ab9ca 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.request.MenuQueryCriteria; +import cn.odboy.model.system.request.QueryMenuRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,7 @@ import java.util.Set; @Mapper public interface MenuMapper extends BaseMapper { - List selectMenuByCriteria(@Param("criteria") MenuQueryCriteria criteria); + List selectMenuByCriteria(@Param("criteria") QueryMenuRequest criteria); LinkedHashSet selectMenuByRoleIdsAndType(@Param("roleIds") Set roleIds, @Param("type") Integer type); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java index 3c6b1860..7380fe64 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.QueryRoleRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,9 +12,9 @@ import java.util.Set; public interface RoleMapper extends BaseMapper { List selectRole(); - List selectRoleByCriteria(@Param("criteria") RoleQueryCriteria criteria); + List selectRoleByCriteria(@Param("criteria") QueryRoleRequest criteria); - Long getRoleCountByCriteria(@Param("criteria") RoleQueryCriteria criteria); + Long getRoleCountByCriteria(@Param("criteria") QueryRoleRequest criteria); Role getRoleByName(@Param("name") String name); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java index 9a2a91ef..058cb29c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.UserQueryCriteria; +import cn.odboy.model.system.request.QueryUserRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,9 +14,9 @@ import java.util.Set; @Mapper public interface UserMapper extends BaseMapper { - Long getUserCountByCriteria(@Param("criteria") UserQueryCriteria criteria); + Long getUserCountByCriteria(@Param("criteria") QueryUserRequest criteria); - IPage queryUserPage(@Param("criteria") UserQueryCriteria criteria, Page page); + IPage queryUserPage(@Param("criteria") QueryUserRequest criteria, Page page); User getUserByUsername(@Param("username") String username); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java index 1124dc5a..c6b58e3e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java @@ -4,7 +4,7 @@ import cn.odboy.application.system.service.DeptService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.QueryDeptRequest; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,14 +39,14 @@ public class DeptController { @ApiOperation("导出部门数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dept:list')") - public void exportDept(HttpServletResponse response, DeptQueryCriteria criteria) throws Exception { + public void exportDept(HttpServletResponse response, QueryDeptRequest criteria) throws Exception { deptService.downloadExcel(deptService.selectDeptByCriteria(criteria, false), response); } @ApiOperation("查询部门") @GetMapping @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDept(DeptQueryCriteria criteria) throws Exception { + public ResponseEntity> queryDept(QueryDeptRequest criteria) throws Exception { List depts = deptService.selectDeptByCriteria(criteria, true); return new ResponseEntity<>(PageUtil.toPage(depts), HttpStatus.OK); } 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 040a0d86..af66c9b8 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 @@ -4,7 +4,7 @@ import cn.odboy.application.system.service.DictService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dict; import cn.odboy.model.system.request.CreateDictRequest; -import cn.odboy.model.system.request.DictQueryCriteria; +import cn.odboy.model.system.request.QueryDictRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,7 +35,7 @@ public class DictController { @ApiOperation("导出字典数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") - public void exportDict(HttpServletResponse response, DictQueryCriteria criteria) throws IOException { + public void exportDict(HttpServletResponse response, QueryDictRequest criteria) throws IOException { dictService.downloadExcel(dictService.selectDictByCriteria(criteria), response); } @@ -43,13 +43,13 @@ public class DictController { @GetMapping(value = "/all") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryAllDict() { - return new ResponseEntity<>(dictService.selectDictByCriteria(new DictQueryCriteria()), HttpStatus.OK); + return new ResponseEntity<>(dictService.selectDictByCriteria(new QueryDictRequest()), HttpStatus.OK); } @ApiOperation("查询字典") @GetMapping @PreAuthorize("@el.check('dict:list')") - public ResponseEntity> queryDict(DictQueryCriteria criteria) { + public ResponseEntity> queryDict(QueryDictRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(dictService.queryDictPage(criteria, page), HttpStatus.OK); } 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 5cf30812..86e38578 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 @@ -4,7 +4,7 @@ import cn.odboy.application.system.service.DictDetailService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.DictDetail; import cn.odboy.model.system.request.CreateDictDetailRequest; -import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.QueryDictDetailRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,7 +35,7 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping - public ResponseEntity> queryDictDetail(DictDetailQueryCriteria criteria) { + public ResponseEntity> queryDictDetail(QueryDictDetailRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(dictDetailService.queryDictDetailPage(criteria, page), HttpStatus.OK); } 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 a6fbbc73..41a6d565 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 @@ -4,7 +4,7 @@ import cn.odboy.application.system.service.JobService; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Job; import cn.odboy.model.system.request.CreateJobRequest; -import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.QueryJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,14 +35,14 @@ public class JobController { @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") - public void exportJob(HttpServletResponse response, JobQueryCriteria criteria) throws IOException { + public void exportJob(HttpServletResponse response, QueryJobRequest criteria) throws IOException { jobService.downloadExcel(jobService.selectJobByCriteria(criteria), response); } @ApiOperation("查询岗位") @GetMapping @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJob(JobQueryCriteria criteria) { + public ResponseEntity> queryJob(QueryJobRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(jobService.queryJobPage(criteria, page), HttpStatus.OK); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java index 12efb1f5..22cc84f5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java @@ -6,8 +6,8 @@ import cn.odboy.base.PageResult; import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.request.MenuQueryCriteria; -import cn.odboy.model.system.response.MenuVo; +import cn.odboy.model.system.request.QueryMenuRequest; +import cn.odboy.model.system.response.MenuResponse; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,13 +45,13 @@ public class MenuController { @ApiOperation("导出菜单数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('menu:list')") - public void exportMenu(HttpServletResponse response, MenuQueryCriteria criteria) throws Exception { + public void exportMenu(HttpServletResponse response, QueryMenuRequest criteria) throws Exception { menuService.downloadExcel(menuService.selectMenuByCriteria(criteria, false), response); } @GetMapping(value = "/build") @ApiOperation("获取前端所需菜单") - public ResponseEntity> buildMenus() { + public ResponseEntity> buildMenus() { List menuList = menuService.selectMenuByUserId(SecurityHelper.getCurrentUserId()); List menus = menuService.buildTree(menuList); return new ResponseEntity<>(menuService.buildMenus(menus), HttpStatus.OK); @@ -79,7 +79,7 @@ public class MenuController { @GetMapping @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> queryMenu(MenuQueryCriteria criteria) throws Exception { + public ResponseEntity> queryMenu(QueryMenuRequest criteria) throws Exception { List menuList = menuService.selectMenuByCriteria(criteria, true); return new ResponseEntity<>(PageUtil.toPage(menuList), HttpStatus.OK); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java index 14e2b4ec..15314d67 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java @@ -7,7 +7,7 @@ import cn.odboy.context.SecurityHelper; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.QueryRoleRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,7 +49,7 @@ public class RoleController { @ApiOperation("导出角色数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('role:list')") - public void exportRole(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException { + public void exportRole(HttpServletResponse response, QueryRoleRequest criteria) throws IOException { roleService.downloadExcel(roleService.selectRoleByCriteria(criteria), response); } @@ -63,7 +63,7 @@ public class RoleController { @ApiOperation("查询角色") @GetMapping @PreAuthorize("@el.check('roles:list')") - public ResponseEntity> queryRole(RoleQueryCriteria criteria) { + public ResponseEntity> queryRole(QueryRoleRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(roleService.queryRolePage(criteria, page), HttpStatus.OK); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java index a7695a05..5103d504 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java @@ -14,8 +14,8 @@ import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.UserQueryCriteria; -import cn.odboy.model.system.response.UserPassVo; +import cn.odboy.model.system.request.QueryUserRequest; +import cn.odboy.model.system.response.UserPassResponse; import cn.odboy.properties.RsaProperties; import cn.odboy.util.PageUtil; import cn.odboy.util.RsaEncryptUtil; @@ -65,14 +65,14 @@ public class UserController { @ApiOperation("导出用户数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('user:list')") - public void exportUser(HttpServletResponse response, UserQueryCriteria criteria) throws IOException { + public void exportUser(HttpServletResponse response, QueryUserRequest criteria) throws IOException { userService.downloadExcel(userService.selectUserByCriteria(criteria), response); } @ApiOperation("查询用户") @GetMapping @PreAuthorize("@el.check('user:list')") - public ResponseEntity> queryUser(UserQueryCriteria criteria) { + public ResponseEntity> queryUser(QueryUserRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); @@ -145,7 +145,7 @@ public class UserController { @ApiOperation("修改密码") @PostMapping(value = "/updatePass") - public ResponseEntity updateUserPassword(@RequestBody UserPassVo passVo) throws Exception { + public ResponseEntity updateUserPassword(@RequestBody UserPassResponse passVo) throws Exception { String oldPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass()); String newPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass()); User user = userService.getUserByUsername(SecurityHelper.getCurrentUsername()); @@ -202,7 +202,7 @@ public class UserController { @ApiOperation("查询用户基础数据") @PostMapping(value = "/queryUserMetaPage") @PreAuthorize("@el.check('user:list')") - public ResponseEntity> queryUserMetaPage(@Validated @RequestBody UserQueryCriteria criteria) { + public ResponseEntity> queryUserMetaPage(@Validated @RequestBody QueryUserRequest criteria) { int maxPageSize = 50; return new ResponseEntity<>(userService.page(new Page<>(criteria.getPage(), maxPageSize), new LambdaQueryWrapper() .and(c -> { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java index 5200182f..9311fabb 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java @@ -3,7 +3,7 @@ package cn.odboy.application.system.service; import cn.odboy.base.BaseResult; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.QueryDeptRequest; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -20,7 +20,7 @@ public interface DeptService extends IService { * @return / * @throws Exception / */ - List selectDeptByCriteria(DeptQueryCriteria criteria, Boolean isQuery) throws Exception; + List selectDeptByCriteria(QueryDeptRequest criteria, Boolean isQuery) throws Exception; /** * 根据ID查询 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 a476789e..0dddfed5 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 @@ -3,7 +3,7 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.DictDetail; import cn.odboy.model.system.request.CreateDictDetailRequest; -import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.QueryDictDetailRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -39,7 +39,7 @@ public interface DictDetailService extends IService { * @param page 分页参数 * @return / */ - PageResult queryDictDetailPage(DictDetailQueryCriteria criteria, Page page); + PageResult queryDictDetailPage(QueryDictDetailRequest criteria, Page page); /** * 根据字典名称获取字典详情 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 241a8ffb..f35ad1c2 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 @@ -3,7 +3,7 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dict; import cn.odboy.model.system.request.CreateDictRequest; -import cn.odboy.model.system.request.DictQueryCriteria; +import cn.odboy.model.system.request.QueryDictRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; @@ -21,7 +21,7 @@ public interface DictService extends IService { * @param page 分页参数 * @return / */ - PageResult queryDictPage(DictQueryCriteria criteria, Page page); + PageResult queryDictPage(QueryDictRequest criteria, Page page); /** * 查询全部数据 @@ -29,7 +29,7 @@ public interface DictService extends IService { * @param criteria / * @return / */ - List selectDictByCriteria(DictQueryCriteria criteria); + List selectDictByCriteria(QueryDictRequest criteria); /** * 创建 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 62285eaa..0010325e 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 @@ -3,7 +3,7 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Job; import cn.odboy.model.system.request.CreateJobRequest; -import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.QueryJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; @@ -50,7 +50,7 @@ public interface JobService extends IService { * @param page 分页参数 * @return / */ - PageResult queryJobPage(JobQueryCriteria criteria, Page page); + PageResult queryJobPage(QueryJobRequest criteria, Page page); /** * 查询全部数据 @@ -58,7 +58,7 @@ public interface JobService extends IService { * @param criteria / * @return / */ - List selectJobByCriteria(JobQueryCriteria criteria); + List selectJobByCriteria(QueryJobRequest criteria); /** * 导出数据 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java index ef4943a5..79bb8d37 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java @@ -1,8 +1,8 @@ package cn.odboy.application.system.service; import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.request.MenuQueryCriteria; -import cn.odboy.model.system.response.MenuVo; +import cn.odboy.model.system.request.QueryMenuRequest; +import cn.odboy.model.system.response.MenuResponse; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -19,7 +19,7 @@ public interface MenuService extends IService { * @return / * @throws Exception / */ - List selectMenuByCriteria(MenuQueryCriteria criteria, Boolean isQuery) throws Exception; + List selectMenuByCriteria(QueryMenuRequest criteria, Boolean isQuery) throws Exception; /** * 根据ID查询 @@ -66,7 +66,7 @@ public interface MenuService extends IService { * @param menus / * @return / */ - List buildMenus(List menus); + List buildMenus(List menus); /** * 删除 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java index 3e7d4b76..8c0e612f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java @@ -5,7 +5,7 @@ import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.dto.RoleCodeDto; import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.QueryRoleRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; @@ -29,7 +29,7 @@ public interface RoleService extends IService { * @param criteria 条件 * @return / */ - List selectRoleByCriteria(RoleQueryCriteria criteria); + List selectRoleByCriteria(QueryRoleRequest criteria); /** * 待条件分页查询 @@ -38,7 +38,7 @@ public interface RoleService extends IService { * @param page 分页参数 * @return / */ - PageResult queryRolePage(RoleQueryCriteria criteria, Page page); + PageResult queryRolePage(QueryRoleRequest criteria, Page page); /** * 根据ID查询 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java index 29c036fb..9c641478 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java @@ -2,7 +2,7 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.UserQueryCriteria; +import cn.odboy.model.system.request.QueryUserRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; @@ -83,7 +83,7 @@ public interface UserService extends IService { * @param page 分页参数 * @return / */ - PageResult queryUserPage(UserQueryCriteria criteria, Page page); + PageResult queryUserPage(QueryUserRequest criteria, Page page); /** * 查询全部不分页 @@ -91,7 +91,7 @@ public interface UserService extends IService { * @param criteria 条件 * @return / */ - List selectUserByCriteria(UserQueryCriteria criteria); + List selectUserByCriteria(QueryUserRequest criteria); /** * 导出数据 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java index 6e126abe..36e34268 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java @@ -16,7 +16,7 @@ import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.request.CreateDeptRequest; -import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.QueryDeptRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; @@ -46,7 +46,7 @@ public class DeptServiceImpl extends ServiceImpl implements De private final RedisHelper redisHelper; @Override - public List selectDeptByCriteria(DeptQueryCriteria criteria, Boolean isQuery) throws Exception { + public List selectDeptByCriteria(QueryDeptRequest criteria, Boolean isQuery) throws Exception { String dataScopeType = SecurityHelper.getDataScopeType(); if (isQuery) { if (dataScopeType.equals(DataScopeEnum.ALL.getValue())) { 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 c5f264d2..e7e22c0f 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 @@ -10,7 +10,7 @@ import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.domain.Dict; import cn.odboy.model.system.domain.DictDetail; import cn.odboy.model.system.request.CreateDictDetailRequest; -import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.QueryDictDetailRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.PageUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -29,7 +29,7 @@ public class DictDetailServiceImpl extends ServiceImpl queryDictDetailPage(DictDetailQueryCriteria criteria, Page page) { + public PageResult queryDictDetailPage(QueryDictDetailRequest criteria, Page page) { return PageUtil.toPage(dictDetailMapper.queryDictDetail(criteria, page)); } 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 9cb835c1..88c70709 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 @@ -10,7 +10,7 @@ import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.domain.Dict; import cn.odboy.model.system.domain.DictDetail; import cn.odboy.model.system.request.CreateDictRequest; -import cn.odboy.model.system.request.DictQueryCriteria; +import cn.odboy.model.system.request.QueryDictRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; @@ -36,13 +36,13 @@ public class DictServiceImpl extends ServiceImpl implements Di private final RedisHelper redisHelper; @Override - public PageResult queryDictPage(DictQueryCriteria criteria, Page page) { + public PageResult queryDictPage(QueryDictRequest criteria, Page page) { IPage dicts = dictMapper.queryDictPage(criteria, page); return PageUtil.toPage(dicts); } @Override - public List selectDictByCriteria(DictQueryCriteria criteria) { + public List selectDictByCriteria(QueryDictRequest criteria) { return dictMapper.queryDictPage(criteria, PageUtil.getCount(dictMapper)).getRecords(); } 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 50562b55..2320c017 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 @@ -10,7 +10,7 @@ import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Job; import cn.odboy.model.system.request.CreateJobRequest; -import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.QueryJobRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; @@ -36,12 +36,12 @@ public class JobServiceImpl extends ServiceImpl implements JobSe private final RedisHelper redisHelper; @Override - public PageResult queryJobPage(JobQueryCriteria criteria, Page page) { + public PageResult queryJobPage(QueryJobRequest criteria, Page page) { return PageUtil.toPage(jobMapper.queryJobPage(criteria, page)); } @Override - public List selectJobByCriteria(JobQueryCriteria criteria) { + public List selectJobByCriteria(QueryJobRequest criteria) { return jobMapper.queryJobPage(criteria, PageUtil.getCount(jobMapper)).getRecords(); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java index 3c9ecefd..cca0dbdc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java @@ -15,9 +15,9 @@ import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.MenuQueryCriteria; -import cn.odboy.model.system.response.MenuMetaVo; -import cn.odboy.model.system.response.MenuVo; +import cn.odboy.model.system.request.QueryMenuRequest; +import cn.odboy.model.system.response.MenuMetaResponse; +import cn.odboy.model.system.response.MenuResponse; import cn.odboy.redis.RedisHelper; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; @@ -53,7 +53,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me private static final String NO_STR = "否"; @Override - public List selectMenuByCriteria(MenuQueryCriteria criteria, Boolean isQuery) throws Exception { + public List selectMenuByCriteria(QueryMenuRequest criteria, Boolean isQuery) throws Exception { if (Boolean.TRUE.equals(isQuery)) { criteria.setPidIsNull(true); List fields = ClassUtil.getAllFields(criteria.getClass(), new ArrayList<>()); @@ -252,43 +252,43 @@ public class MenuServiceImpl extends ServiceImpl implements Me } @Override - public List buildMenus(List menus) { - List list = new LinkedList<>(); + public List buildMenus(List menus) { + List list = new LinkedList<>(); menus.forEach(menu -> { if (menu != null) { List menuList = menu.getChildren(); - MenuVo menuVo = new MenuVo(); - menuVo.setName(ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle()); + MenuResponse menuResponse = new MenuResponse(); + menuResponse.setName(ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle()); // 一级目录需要加斜杠，不然会报警告 - menuVo.setPath(menu.getPid() == null ? "/" + menu.getPath() : menu.getPath()); - menuVo.setHidden(menu.getHidden()); + menuResponse.setPath(menu.getPid() == null ? "/" + menu.getPath() : menu.getPath()); + menuResponse.setHidden(menu.getHidden()); // 如果不是外链 if (!menu.getIFrame()) { if (menu.getPid() == null) { - menuVo.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent()); + menuResponse.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "Layout" : menu.getComponent()); // 如果不是一级菜单，并且菜单类型为目录，则代表是多级菜单 } else if (menu.getType() == 0) { - menuVo.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "ParentView" : menu.getComponent()); + menuResponse.setComponent(StringUtil.isEmpty(menu.getComponent()) ? "ParentView" : menu.getComponent()); } else if (StringUtil.isNoneBlank(menu.getComponent())) { - menuVo.setComponent(menu.getComponent()); + menuResponse.setComponent(menu.getComponent()); } } - menuVo.setMeta(new MenuMetaVo(menu.getTitle(), menu.getIcon(), !menu.getCache())); + menuResponse.setMeta(new MenuMetaResponse(menu.getTitle(), menu.getIcon(), !menu.getCache())); if (CollectionUtil.isNotEmpty(menuList)) { - menuVo.setAlwaysShow(true); - menuVo.setRedirect("noredirect"); - menuVo.setChildren(buildMenus(menuList)); + menuResponse.setAlwaysShow(true); + menuResponse.setRedirect("noredirect"); + menuResponse.setChildren(buildMenus(menuList)); // 处理是一级菜单并且没有子菜单的情况 } else if (menu.getPid() == null) { - MenuVo menuVo1 = getMenuVo(menu, menuVo); - menuVo.setName(null); - menuVo.setMeta(null); - menuVo.setComponent("Layout"); - List list1 = new ArrayList<>(); - list1.add(menuVo1); - menuVo.setChildren(list1); + MenuResponse menuResponse1 = getMenuVo(menu, menuResponse); + menuResponse.setName(null); + menuResponse.setMeta(null); + menuResponse.setComponent("Layout"); + List list1 = new ArrayList<>(); + list1.add(menuResponse1); + menuResponse.setChildren(list1); } - list.add(menuVo); + list.add(menuResponse); } } ); @@ -334,23 +334,23 @@ public class MenuServiceImpl extends ServiceImpl implements Me } /** - * 获取 MenuVo + * 获取 MenuResponse * * @param menu / - * @param menuVo / + * @param menuResponse / * @return / */ - private static MenuVo getMenuVo(Menu menu, MenuVo menuVo) { - MenuVo menuVo1 = new MenuVo(); - menuVo1.setMeta(menuVo.getMeta()); + private static MenuResponse getMenuVo(Menu menu, MenuResponse menuResponse) { + MenuResponse menuResponse1 = new MenuResponse(); + menuResponse1.setMeta(menuResponse.getMeta()); // 非外链 if (!menu.getIFrame()) { - menuVo1.setPath("index"); - menuVo1.setName(menuVo.getName()); - menuVo1.setComponent(menuVo.getComponent()); + menuResponse1.setPath("index"); + menuResponse1.setName(menuResponse.getName()); + menuResponse1.setComponent(menuResponse.getComponent()); } else { - menuVo1.setPath(menu.getPath()); + menuResponse1.setPath(menu.getPath()); } - return menuVo1; + return menuResponse1; } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java index 15352f59..f2e46bba 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java @@ -18,7 +18,7 @@ import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.dto.RoleCodeDto; import cn.odboy.model.system.request.CreateRoleRequest; -import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.QueryRoleRequest; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; @@ -56,12 +56,12 @@ public class RoleServiceImpl extends ServiceImpl implements Ro } @Override - public List selectRoleByCriteria(RoleQueryCriteria criteria) { + public List selectRoleByCriteria(QueryRoleRequest criteria) { return roleMapper.selectRoleByCriteria(criteria); } @Override - public PageResult queryRolePage(RoleQueryCriteria criteria, Page page) { + public PageResult queryRolePage(QueryRoleRequest criteria, Page page) { criteria.setOffset(page.offset()); List roles = roleMapper.selectRoleByCriteria(criteria); Long total = roleMapper.getRoleCountByCriteria(criteria); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java index f56ddd96..5c06fe3b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java @@ -14,7 +14,7 @@ import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Job; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.request.UserQueryCriteria; +import cn.odboy.model.system.request.QueryUserRequest; import cn.odboy.properties.FileProperties; import cn.odboy.redis.RedisHelper; import cn.odboy.util.FileUtil; @@ -53,7 +53,7 @@ public class UserServiceImpl extends ServiceImpl implements Us private final UserOnlineService userOnlineService; @Override - public PageResult queryUserPage(UserQueryCriteria criteria, Page page) { + public PageResult queryUserPage(QueryUserRequest criteria, Page page) { criteria.setOffset(page.offset()); List users = userMapper.queryUserPage(criteria, PageUtil.getCount(userMapper)).getRecords(); Long total = userMapper.getUserCountByCriteria(criteria); @@ -61,7 +61,7 @@ public class UserServiceImpl extends ServiceImpl implements Us } @Override - public List selectUserByCriteria(UserQueryCriteria criteria) { + public List selectUserByCriteria(QueryUserRequest criteria) { return userMapper.queryUserPage(criteria, PageUtil.getCount(userMapper)).getRecords(); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java index 88a8de24..49efcf57 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.tools.mapper; import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.LocalStorageQueryCriteria; +import cn.odboy.model.tools.request.QueryLocalStorageRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface LocalStorageMapper extends BaseMapper { - IPage queryLocalStoragePage(@Param("criteria") LocalStorageQueryCriteria criteria, Page page); + IPage queryLocalStoragePage(@Param("criteria") QueryLocalStorageRequest criteria, Page page); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java index 993fb55e..52804bce 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.tools.mapper; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QueryQiniuRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,5 +13,5 @@ import org.apache.ibatis.annotations.Param; public interface QiniuContentMapper extends BaseMapper { QiniuContent getQiniuContentByName(@Param("name") String name); - IPage queryQiniuContentPage(@Param("criteria") QiniuQueryCriteria criteria, Page page); + IPage queryQiniuContentPage(@Param("criteria") QueryQiniuRequest criteria, Page page); } \ No newline at end of file diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java index c1b6a193..09d2a9a0 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/EmailController.java @@ -2,7 +2,7 @@ package cn.odboy.application.tools.rest; import cn.odboy.application.tools.service.EmailService; import cn.odboy.model.tools.domain.EmailConfig; -import cn.odboy.model.tools.dto.EmailDto; +import cn.odboy.model.tools.request.SendEmailRequest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -41,8 +41,8 @@ public class EmailController { @PostMapping @ApiOperation("发送邮件") - public ResponseEntity sendEmail(@Validated @RequestBody EmailDto emailDto) { - emailService.sendEmail(emailDto); + public ResponseEntity sendEmail(@Validated @RequestBody SendEmailRequest sendEmailRequest) { + emailService.sendEmail(sendEmailRequest); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java index 592d8d6e..3cc013bd 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java @@ -5,7 +5,7 @@ import cn.odboy.base.PageResult; import cn.odboy.constant.FileTypeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.LocalStorageQueryCriteria; +import cn.odboy.model.tools.request.QueryLocalStorageRequest; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -37,7 +37,7 @@ public class LocalStorageController { @GetMapping @ApiOperation("查询文件") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryFile(LocalStorageQueryCriteria criteria) { + public ResponseEntity> queryFile(QueryLocalStorageRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(localStorageService.queryLocalStoragePage(criteria, page), HttpStatus.OK); } @@ -45,7 +45,7 @@ public class LocalStorageController { @ApiOperation("导出数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException { + public void exportFile(HttpServletResponse response, QueryLocalStorageRequest criteria) throws IOException { localStorageService.downloadExcel(localStorageService.selectLocalStorageByCriteria(criteria), response); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java index 4400a498..cbad6267 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java @@ -5,7 +5,7 @@ import cn.odboy.application.tools.service.QiniuContentService; import cn.odboy.base.PageResult; import cn.odboy.model.tools.domain.QiniuConfig; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QueryQiniuRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -56,13 +56,13 @@ public class QiniuController { @ApiOperation("导出数据") @GetMapping(value = "/download") - public void exportQiNiu(HttpServletResponse response, QiniuQueryCriteria criteria) throws IOException { + public void exportQiNiu(HttpServletResponse response, QueryQiniuRequest criteria) throws IOException { qiniuContentService.downloadExcel(qiniuContentService.selectQiniuContentByCriteria(criteria), response); } @ApiOperation("查询文件") @GetMapping - public ResponseEntity> queryQiNiu(QiniuQueryCriteria criteria) { + public ResponseEntity> queryQiNiu(QueryQiniuRequest criteria) { Page page = new Page<>(criteria.getPage(), criteria.getSize()); return new ResponseEntity<>(qiniuContentService.queryQiniuContentPage(criteria, page), HttpStatus.OK); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java index 0494d336..62351ca6 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java @@ -1,7 +1,7 @@ package cn.odboy.application.tools.service; -import cn.odboy.model.tools.dto.EmailDto; +import cn.odboy.model.tools.request.SendEmailRequest; public interface CaptchaService { /** @@ -11,7 +11,7 @@ public interface CaptchaService { * @param key / * @return / */ - EmailDto renderCode(String email, String key); + SendEmailRequest renderCode(String email, String key); /** diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java index d20c802f..560e308b 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java @@ -1,7 +1,7 @@ package cn.odboy.application.tools.service; import cn.odboy.model.tools.domain.EmailConfig; -import cn.odboy.model.tools.dto.EmailDto; +import cn.odboy.model.tools.request.SendEmailRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -26,9 +26,9 @@ public interface EmailService extends IService { /** * 发送邮件 * - * @param emailDto 邮件发送的内容 + * @param sendEmailRequest 邮件发送的内容 */ - void sendEmail(EmailDto emailDto); + void sendEmail(SendEmailRequest sendEmailRequest); /** * 发送邮件验证码 diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java index a59e5458..be548a50 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java @@ -2,7 +2,7 @@ package cn.odboy.application.tools.service; import cn.odboy.base.PageResult; import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.request.LocalStorageQueryCriteria; +import cn.odboy.model.tools.request.QueryLocalStorageRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; @@ -20,7 +20,7 @@ public interface LocalStorageService extends IService { * @param page 分页参数 * @return / */ - PageResult queryLocalStoragePage(LocalStorageQueryCriteria criteria, Page page); + PageResult queryLocalStoragePage(QueryLocalStorageRequest criteria, Page page); /** * 查询全部数据 @@ -28,7 +28,7 @@ public interface LocalStorageService extends IService { * @param criteria 条件 * @return / */ - List selectLocalStorageByCriteria(LocalStorageQueryCriteria criteria); + List selectLocalStorageByCriteria(QueryLocalStorageRequest criteria); /** * 上传 diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java index 73630c62..f1ee4b34 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java @@ -2,7 +2,7 @@ package cn.odboy.application.tools.service; import cn.odboy.base.PageResult; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QueryQiniuRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; @@ -20,7 +20,7 @@ public interface QiniuContentService extends IService { * @param page 分页参数 * @return / */ - PageResult queryQiniuContentPage(QiniuQueryCriteria criteria, Page page); + PageResult queryQiniuContentPage(QueryQiniuRequest criteria, Page page); /** * 查询全部 @@ -28,7 +28,7 @@ public interface QiniuContentService extends IService { * @param criteria 条件 * @return / */ - List selectQiniuContentByCriteria(QiniuQueryCriteria criteria); + List selectQiniuContentByCriteria(QueryQiniuRequest criteria); /** * 上传文件 diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java index abaf3d31..7ca98e66 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java @@ -8,7 +8,7 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.tools.dto.EmailDto; +import cn.odboy.model.tools.request.SendEmailRequest; import cn.odboy.redis.RedisHelper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -25,8 +25,8 @@ public class CaptchaServiceImpl implements CaptchaService { @Override @Transactional(rollbackFor = Exception.class) - public EmailDto renderCode(String email, String key) { - EmailDto emailDto; + public SendEmailRequest renderCode(String email, String key) { + SendEmailRequest sendEmailRequest; String content; String redisKey = key + email; // 如果不存在有效的验证码，就创建一个新的 @@ -44,8 +44,8 @@ public class CaptchaServiceImpl implements CaptchaService { } else { content = template.render(Dict.create().set("code", oldCode)); } - emailDto = new EmailDto(Collections.singletonList(email), "CuteJava后台管理系统", content); - return emailDto; + sendEmailRequest = new SendEmailRequest(Collections.singletonList(email), "CuteJava后台管理系统", content); + return sendEmailRequest; } @Override diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java index 1587a4f1..4aed18b5 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java @@ -8,7 +8,7 @@ import cn.odboy.application.tools.service.EmailService; import cn.odboy.constant.CodeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.domain.EmailConfig; -import cn.odboy.model.tools.dto.EmailDto; +import cn.odboy.model.tools.request.SendEmailRequest; import cn.odboy.util.DesEncryptUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +50,7 @@ public class EmailServiceImpl extends ServiceImpl queryLocalStoragePage(LocalStorageQueryCriteria criteria, Page page) { + public PageResult queryLocalStoragePage(QueryLocalStorageRequest criteria, Page page) { return PageUtil.toPage(localStorageMapper.queryLocalStoragePage(criteria, page)); } @Override - public List selectLocalStorageByCriteria(LocalStorageQueryCriteria criteria) { + public List selectLocalStorageByCriteria(QueryLocalStorageRequest criteria) { return localStorageMapper.queryLocalStoragePage(criteria, PageUtil.getCount(localStorageMapper)).getRecords(); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java index 444f0ee9..96662819 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java @@ -8,7 +8,7 @@ import cn.odboy.base.PageResult; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.domain.QiniuConfig; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.request.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QueryQiniuRequest; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; import com.alibaba.fastjson2.JSON; @@ -46,12 +46,12 @@ public class QiniuContentServiceImpl extends ServiceImpl queryQiniuContentPage(QiniuQueryCriteria criteria, Page page) { + public PageResult queryQiniuContentPage(QueryQiniuRequest criteria, Page page) { return PageUtil.toPage(qiniuContentMapper.queryQiniuContentPage(criteria, page)); } @Override - public List selectQiniuContentByCriteria(QiniuQueryCriteria criteria) { + public List selectQiniuContentByCriteria(QueryQiniuRequest criteria) { return qiniuContentMapper.queryQiniuContentPage(criteria, PageUtil.getCount(qiniuContentMapper)).getRecords(); }