From cf98f045b2603254e932c37661f4b3d772e314c4 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 12 Jun 2023 18:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90app=E3=80=91=E5=AE=8C=E5=96=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-s-sys/sys-business-permission/pom.xml | 8 ++++ .../app/controller/SysAppController.java | 12 ------ .../kernel/sys/modular/app/entity/SysApp.java | 3 ++ .../app/service/impl/SysAppServiceImpl.java | 43 ++++++++----------- 4 files changed, 28 insertions(+), 38 deletions(-) diff --git a/kernel-s-sys/sys-business-permission/pom.xml b/kernel-s-sys/sys-business-permission/pom.xml index 172815e3d..f864bd93b 100644 --- a/kernel-s-sys/sys-business-permission/pom.xml +++ b/kernel-s-sys/sys-business-permission/pom.xml @@ -17,6 +17,14 @@ + + + + cn.stylefeng.roses + file-api + ${roses.version} + + cn.stylefeng.roses diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/controller/SysAppController.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/controller/SysAppController.java index dbc833aa8..a3603c91d 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/controller/SysAppController.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/controller/SysAppController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * 系统应用控制器 @@ -76,17 +75,6 @@ public class SysAppController { return new SuccessResponseData<>(sysAppService.detail(sysAppRequest)); } - /** - * 获取列表 - * - * @author fengshuonan - * @date 2023/06/10 21:28 - */ - @GetResource(name = "获取列表", path = "/sysApp/list") - public ResponseData> list(SysAppRequest sysAppRequest) { - return new SuccessResponseData<>(sysAppService.findList(sysAppRequest)); - } - /** * 获取列表（带分页） * diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/entity/SysApp.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/entity/SysApp.java index 8b0445feb..72ea761f7 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/entity/SysApp.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/entity/SysApp.java @@ -1,7 +1,9 @@ package cn.stylefeng.roses.kernel.sys.modular.app.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity; +import cn.stylefeng.roses.kernel.file.api.format.FileUrlFormatProcess; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -48,6 +50,7 @@ public class SysApp extends BaseExpandFieldEntity { */ @TableField("app_icon") @ChineseDescription("应用图标，存fileId，上传的图片") + @SimpleFieldFormat(processClass = FileUrlFormatProcess.class) private Long appIcon; /** diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java index 9c3b3ad38..06adb2665 100644 --- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java +++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; +import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.modular.app.entity.SysApp; @@ -16,7 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.List; /** @@ -28,7 +28,7 @@ import java.util.List; @Service public class SysAppServiceImpl extends ServiceImpl implements SysAppService { - @Override + @Override public void add(SysAppRequest sysAppRequest) { SysApp sysApp = new SysApp(); BeanUtil.copyProperties(sysAppRequest, sysApp); @@ -56,8 +56,12 @@ public class SysAppServiceImpl extends ServiceImpl impleme @Override public PageResult findPage(SysAppRequest sysAppRequest) { LambdaQueryWrapper wrapper = createWrapper(sysAppRequest); - Page sysRolePage = this.page(PageFactory.defaultPage(), wrapper); - return PageResultFactory.createPageResult(sysRolePage); + + // 只查询有用的列 + wrapper.select(SysApp::getAppId, SysApp::getAppName, SysApp::getAppCode, SysApp::getAppIcon, SysApp::getStatusFlag, SysApp::getAppSort, BaseEntity::getCreateTime); + + Page sysAppPage = this.page(PageFactory.defaultPage(), wrapper); + return PageResultFactory.createPageResult(sysAppPage); } @Override @@ -89,29 +93,16 @@ public class SysAppServiceImpl extends ServiceImpl impleme private LambdaQueryWrapper createWrapper(SysAppRequest sysAppRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Long appId = sysAppRequest.getAppId(); - String appName = sysAppRequest.getAppName(); - String appCode = sysAppRequest.getAppCode(); - Long appIcon = sysAppRequest.getAppIcon(); - Integer statusFlag = sysAppRequest.getStatusFlag(); - BigDecimal appSort = sysAppRequest.getAppSort(); - String remark = sysAppRequest.getRemark(); - String expandField = sysAppRequest.getExpandField(); - Long versionFlag = sysAppRequest.getVersionFlag(); - String delFlag = sysAppRequest.getDelFlag(); - Long tenantId = sysAppRequest.getTenantId(); + // 根据搜索条件查询 + String searchText = sysAppRequest.getSearchText(); + if (ObjectUtil.isNotEmpty(searchText)) { + queryWrapper.like(SysApp::getAppCode, searchText); + queryWrapper.or().like(SysApp::getAppName, searchText); + queryWrapper.or().like(SysApp::getRemark, searchText); + } - queryWrapper.eq(ObjectUtil.isNotNull(appId), SysApp::getAppId, appId); - queryWrapper.like(ObjectUtil.isNotEmpty(appName), SysApp::getAppName, appName); - queryWrapper.like(ObjectUtil.isNotEmpty(appCode), SysApp::getAppCode, appCode); - queryWrapper.eq(ObjectUtil.isNotNull(appIcon), SysApp::getAppIcon, appIcon); - queryWrapper.eq(ObjectUtil.isNotNull(statusFlag), SysApp::getStatusFlag, statusFlag); - queryWrapper.eq(ObjectUtil.isNotNull(appSort), SysApp::getAppSort, appSort); - queryWrapper.like(ObjectUtil.isNotEmpty(remark), SysApp::getRemark, remark); - queryWrapper.like(ObjectUtil.isNotEmpty(expandField), SysApp::getExpandField, expandField); - queryWrapper.eq(ObjectUtil.isNotNull(versionFlag), SysApp::getVersionFlag, versionFlag); - queryWrapper.like(ObjectUtil.isNotEmpty(delFlag), SysApp::getDelFlag, delFlag); - queryWrapper.eq(ObjectUtil.isNotNull(tenantId), SysApp::getTenantId, tenantId); + // 根据排序查询 + queryWrapper.orderByAsc(SysApp::getAppSort); return queryWrapper; }