From 9432ae22aaa632890e60b53e777be6f30246f4e9 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 8 Feb 2021 17:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90app=E3=80=91=E6=9B=B4=E6=96=B0app?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/pojo/{ => app}/SysAppRequest.java | 2 +- .../modular/controller/SysAppController.java | 26 ++++---- .../app/modular/service/SysAppService.java | 20 +++--- .../service/impl/SysAppServiceImpl.java | 61 +++++++++---------- 4 files changed, 53 insertions(+), 56 deletions(-) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/{ => app}/SysAppRequest.java (97%) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysAppRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/SysAppRequest.java similarity index 97% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysAppRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/SysAppRequest.java index 06144820b..d34323d62 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysAppRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/SysAppRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo; +package cn.stylefeng.roses.kernel.system.pojo.app; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue; diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/controller/SysAppController.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/controller/SysAppController.java index bc7268fc7..79c83fd20 100644 --- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/controller/SysAppController.java +++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/controller/SysAppController.java @@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; -import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest; +import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -62,6 +62,18 @@ public class SysAppController { return new SuccessResponseData(); } + /** + * 修改应用状态 + * + * @author fengshuonan + * @date 2020/6/29 16:49 + */ + @PostResource(name = "修改应用状态", path = "/sysApp/updateStatus") + public ResponseData updateStatus(@RequestBody @Validated(SysAppRequest.updateStatus.class) SysAppRequest sysAppParam) { + sysAppService.editStatus(sysAppParam); + return new SuccessResponseData(); + } + /** * 查看系统应用 * @@ -107,16 +119,4 @@ public class SysAppController { return new SuccessResponseData(); } - /** - * 修改应用状态 - * - * @author fengshuonan - * @date 2020/6/29 16:49 - */ - @PostResource(name = "修改应用状态", path = "/sysApp/updateStatus") - public ResponseData updateStatus(@RequestBody @Validated(SysAppRequest.updateStatus.class) SysAppRequest sysAppParam) { - sysAppService.updateStatus(sysAppParam); - return new SuccessResponseData(); - } - } diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java index fa7808b9d..bd08c9461 100644 --- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java +++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java @@ -26,7 +26,7 @@ package cn.stylefeng.roses.kernel.app.modular.service; import cn.stylefeng.roses.kernel.app.modular.entity.SysApp; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest; +import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -66,6 +66,15 @@ public interface SysAppService extends IService { */ void edit(SysAppRequest sysAppParam); + /** + * 更新状态 + * + * @param sysAppParam 请求参数 + * @author fengshuonan + * @date 2021/1/6 14:30 + */ + void editStatus(SysAppRequest sysAppParam); + /** * 查看系统应用 * @@ -105,13 +114,4 @@ public interface SysAppService extends IService { */ void updateActiveFlag(SysAppRequest sysAppParam); - /** - * 更新状态 - * - * @param sysAppParam 请求参数 - * @author fengshuonan - * @date 2021/1/6 14:30 - */ - void updateStatus(SysAppRequest sysAppParam); - } diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java index 8f889983b..b99ea87bd 100644 --- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java +++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java @@ -16,7 +16,7 @@ import cn.stylefeng.roses.kernel.system.AppServiceApi; import cn.stylefeng.roses.kernel.system.MenuServiceApi; import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum; -import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest; +import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -94,6 +94,20 @@ public class SysAppServiceImpl extends ServiceImpl impleme this.updateById(sysApp); } + @Override + public void editStatus(SysAppRequest sysAppParam) { + SysApp currentApp = this.querySysApp(sysAppParam); + + // 激活状态的不能被禁用 + if (YesOrNotEnum.Y.getCode().equals(currentApp.getActiveFlag()) + && StatusEnum.DISABLE.getCode().equals(sysAppParam.getStatusFlag())) { + throw new SystemModularException(AppExceptionEnum.CANT_DISABLE); + } + + currentApp.setStatusFlag(sysAppParam.getStatusFlag()); + this.updateById(currentApp); + } + @Override public SysApp detail(SysAppRequest sysAppRequest) { return this.querySysApp(sysAppRequest); @@ -128,27 +142,13 @@ public class SysAppServiceImpl extends ServiceImpl impleme this.updateById(currentApp); } - @Override - public void updateStatus(SysAppRequest sysAppParam) { - SysApp currentApp = this.querySysApp(sysAppParam); - - // 激活状态的不能被禁用 - if (YesOrNotEnum.Y.getCode().equals(currentApp.getActiveFlag()) - && StatusEnum.DISABLE.getCode().equals(sysAppParam.getStatusFlag())) { - throw new SystemModularException(AppExceptionEnum.CANT_DISABLE); - } - - currentApp.setStatusFlag(sysAppParam.getStatusFlag()); - this.updateById(currentApp); - } - @Override public Set getAppsByAppCodes(Set appCodes) { HashSet simpleDicts = new HashSet<>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(SysApp::getAppCode, appCodes); - queryWrapper.select(SysApp::getAppCode, SysApp::getAppId, SysApp::getAppName); + queryWrapper.select(SysApp::getAppId, SysApp::getAppCode, SysApp::getAppName); List list = this.list(queryWrapper); for (SysApp sysApp : list) { @@ -219,26 +219,23 @@ public class SysAppServiceImpl extends ServiceImpl impleme */ private LambdaQueryWrapper createWrapper(SysAppRequest sysAppRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (ObjectUtil.isNotNull(sysAppRequest)) { - // 根据id查询 - if (ObjectUtil.isNotEmpty(sysAppRequest.getAppId())) { - queryWrapper.eq(SysApp::getAppId, sysAppRequest.getAppId()); - } - - // 根据名称模糊查询 - if (ObjectUtil.isNotEmpty(sysAppRequest.getAppName())) { - queryWrapper.like(SysApp::getAppName, sysAppRequest.getAppName()); - } - - // 根据编码模糊查询 - if (ObjectUtil.isNotEmpty(sysAppRequest.getAppCode())) { - queryWrapper.like(SysApp::getAppCode, sysAppRequest.getAppCode()); - } - } // 查询未删除状态的 queryWrapper.eq(SysApp::getDelFlag, YesOrNotEnum.N.getCode()); + if (ObjectUtil.isEmpty(sysAppRequest)) { + return queryWrapper; + } + + // 根据id查询 + queryWrapper.eq(ObjectUtil.isNotEmpty(sysAppRequest.getAppId()), SysApp::getAppId, sysAppRequest.getAppId()); + + // 根据名称模糊查询 + queryWrapper.like(ObjectUtil.isNotEmpty(sysAppRequest.getAppName()), SysApp::getAppName, sysAppRequest.getAppName()); + + // 根据编码模糊查询 + queryWrapper.like(ObjectUtil.isNotEmpty(sysAppRequest.getAppCode()), SysApp::getAppCode, sysAppRequest.getAppCode()); + return queryWrapper; }