From 93ec68e8a03ba1c5632fbef67497cf1965b867ea Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 30 Mar 2022 19:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E3=80=90expand=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysExpandFieldController.java | 3 ++- .../pojo/request/SysExpandFieldRequest.java | 2 +- .../service/impl/SysExpandFieldServiceImpl.java | 14 -------------- .../modular/service/impl/SysExpandServiceImpl.java | 6 ++---- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/controller/SysExpandFieldController.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/controller/SysExpandFieldController.java index 14cb7d5d4..e072d9587 100644 --- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/controller/SysExpandFieldController.java +++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/controller/SysExpandFieldController.java @@ -4,6 +4,7 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.expand.modular.modular.entity.SysExpandField; import cn.stylefeng.roses.kernel.expand.modular.modular.pojo.request.SysExpandFieldRequest; import cn.stylefeng.roses.kernel.expand.modular.modular.service.SysExpandFieldService; +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -94,7 +95,7 @@ public class SysExpandFieldController { * @date 2022/03/29 23:47 */ @GetResource(name = "分页查询", path = "/sysExpandField/page") - public ResponseData> page(SysExpandFieldRequest sysExpandFieldRequest) { + public ResponseData> page(@Validated(BaseRequest.page.class) SysExpandFieldRequest sysExpandFieldRequest) { return new SuccessResponseData<>(sysExpandFieldService.findPage(sysExpandFieldRequest)); } diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandFieldRequest.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandFieldRequest.java index 6c22ded49..f0f43e0d6 100644 --- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandFieldRequest.java +++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandFieldRequest.java @@ -28,7 +28,7 @@ public class SysExpandFieldRequest extends BaseRequest { /** * 对应拓展业务的主键id */ - @NotNull(message = "对应拓展业务的主键id不能为空", groups = {add.class, edit.class}) + @NotNull(message = "对应拓展业务的主键id不能为空", groups = {add.class, edit.class, page.class}) @ChineseDescription("对应拓展业务的主键id") private Long expandId; diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandFieldServiceImpl.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandFieldServiceImpl.java index c0ff9626d..cbd5b8a9a 100644 --- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandFieldServiceImpl.java +++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandFieldServiceImpl.java @@ -88,23 +88,9 @@ public class SysExpandFieldServiceImpl extends ServiceImpl createWrapper(SysExpandFieldRequest sysExpandFieldRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Long fieldId = sysExpandFieldRequest.getFieldId(); Long expandId = sysExpandFieldRequest.getExpandId(); - String fieldName = sysExpandFieldRequest.getFieldName(); - String fieldCode = sysExpandFieldRequest.getFieldCode(); - Integer fieldType = sysExpandFieldRequest.getFieldType(); - String fieldRequired = sysExpandFieldRequest.getFieldRequired(); - Integer fieldLength = sysExpandFieldRequest.getFieldLength(); - String listShowFlag = sysExpandFieldRequest.getListShowFlag(); - queryWrapper.eq(ObjectUtil.isNotNull(fieldId), SysExpandField::getFieldId, fieldId); queryWrapper.eq(ObjectUtil.isNotNull(expandId), SysExpandField::getExpandId, expandId); - queryWrapper.like(ObjectUtil.isNotEmpty(fieldName), SysExpandField::getFieldName, fieldName); - queryWrapper.like(ObjectUtil.isNotEmpty(fieldCode), SysExpandField::getFieldCode, fieldCode); - queryWrapper.eq(ObjectUtil.isNotNull(fieldType), SysExpandField::getFieldType, fieldType); - queryWrapper.like(ObjectUtil.isNotEmpty(fieldRequired), SysExpandField::getFieldRequired, fieldRequired); - queryWrapper.eq(ObjectUtil.isNotNull(fieldLength), SysExpandField::getFieldLength, fieldLength); - queryWrapper.like(ObjectUtil.isNotEmpty(listShowFlag), SysExpandField::getListShowFlag, listShowFlag); return queryWrapper; } diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java index 2ca4c93e6..984bc7fc4 100644 --- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java +++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java @@ -74,6 +74,8 @@ public class SysExpandServiceImpl extends ServiceImpl findList(SysExpandRequest sysExpandRequest) { LambdaQueryWrapper wrapper = this.createWrapper(sysExpandRequest); + wrapper.select(SysExpand::getExpandId, SysExpand::getExpandName, SysExpand::getExpandCode); + wrapper.eq(SysExpand::getExpandStatus, StatusEnum.ENABLE.getCode()); return this.list(wrapper); } @@ -103,14 +105,10 @@ public class SysExpandServiceImpl extends ServiceImpl