diff --git a/cutejava-front/src/mixins/crud.js b/cutejava-front/src/mixins/crud.js index ddae55b7..aeb96afa 100644 --- a/cutejava-front/src/mixins/crud.js +++ b/cutejava-front/src/mixins/crud.js @@ -19,6 +19,8 @@ export default { url: '', // 查询数据的参数 params: {}, + // 是否自定义参数 + isCustomParams: false, // 待查询的对象 query: {}, // 等待时间 @@ -76,11 +78,21 @@ export default { Object.keys(this.params).length !== 0 && Object.keys(this.params).forEach(item => { if (this.params[item] === null || this.params[item] === '') this.params[item] = undefined }) - return { - page: this.page, - size: this.size, - ...this.query, - ...this.params + if (this.isCustomParams) { + return { + page: this.page, + size: this.size, + args: { + ...this.params + } + } + } else { + return { + page: this.page, + size: this.size, + ...this.query, + ...this.params + } } }, // 改变页码 diff --git a/cutejava-front/src/views/system/quartzJob/log.vue b/cutejava-front/src/views/system/quartzJob/log.vue index e4f9c6c2..27007115 100644 --- a/cutejava-front/src/views/system/quartzJob/log.vue +++ b/cutejava-front/src/views/system/quartzJob/log.vue @@ -73,7 +73,7 @@ > queryQuartzJobLog(SystemQueryQuartzJobArgs args) { - Page page = new Page<>(args.getPage(), args.getSize()); - return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page)); + public ResponseEntity> queryQuartzJobLog(@Validated @RequestBody KitPageArgs pageArgs) { + Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); + return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(pageArgs.getArgs(), page)); } @OperationLog diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java index 88ee8d81..6aebbb30 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java @@ -29,8 +29,4 @@ public class SystemQueryQuartzJobArgs { private Boolean isSuccess; @ApiModelProperty(value = "创建时间") private List createTime; - @ApiModelProperty(value = "页码", example = "1") - private Integer page = 1; - @ApiModelProperty(value = "每页数据量", example = "10") - private Integer size = 10; } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java index 68a9d3ba..2432fc06 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java @@ -26,7 +26,6 @@ import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.mysql.SystemDictMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; -import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -98,9 +97,10 @@ public class SystemDictService { } private void injectQueryParams(SystemQueryDictArgs args, LambdaQueryWrapper wrapper) { - KitValidUtil.notNull(args); - wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or() - .like(SystemDictTb::getDescription, args.getBlurry())); + if (args != null) { + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or() + .like(SystemDictTb::getDescription, args.getBlurry())); + } } public List queryDictByArgs(SystemQueryDictArgs args) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java index 0b03c384..630a2cf4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java @@ -26,7 +26,6 @@ import cn.odboy.system.dal.model.request.SystemQueryJobArgs; import cn.odboy.system.dal.mysql.SystemJobMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitPageUtil; -import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -129,12 +128,13 @@ public class SystemJobService { } public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper wrapper) { - KitValidUtil.notNull(args); - wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName()); - wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled()); - if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { - wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0), - args.getCreateTime().get(1)); + if (args != null) { + wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName()); + wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled()); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0), + args.getCreateTime().get(1)); + } } wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java index 6fe99a64..f0343d10 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java @@ -33,7 +33,6 @@ import cn.odboy.system.dal.mysql.SystemLocalStorageMapper; import cn.odboy.util.KitBeanUtil; import cn.odboy.util.KitFileUtil; import cn.odboy.util.KitPageUtil; -import cn.odboy.util.KitValidUtil; import cn.odboy.util.xlsx.KitExcelExporter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -140,15 +139,16 @@ public class SystemLocalStorageService { } private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper wrapper) { - KitValidUtil.notNull(args); - wrapper.and(StrUtil.isNotBlank(args.getBlurry()), - c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or() - .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or() - .like(SystemLocalStorageTb::getType, args.getBlurry()).or() - .like(SystemLocalStorageTb::getCreateBy, args.getBlurry())); - if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { - wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0), - args.getCreateTime().get(1)); + if (args != null) { + wrapper.and(StrUtil.isNotBlank(args.getBlurry()), + c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or() + .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or() + .like(SystemLocalStorageTb::getType, args.getBlurry()).or() + .like(SystemLocalStorageTb::getCreateBy, args.getBlurry())); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0), + args.getCreateTime().get(1)); + } } wrapper.orderByDesc(SystemLocalStorageTb::getId); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java index 88e500b4..e4cee023 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java @@ -219,11 +219,12 @@ public class SystemQuartzJobService { } private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper wrapper) { - KitValidUtil.notNull(args); - wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName, args.getJobName()); - wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess()); - if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { - wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + if (args != null) { + wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName, args.getJobName()); + wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess()); + if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) { + wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1)); + } } wrapper.orderByDesc(SystemQuartzLogTb::getId); }