From 213785d89fe61d4a1a31a2839abc22b4dc1b46ce Mon Sep 17 00:00:00 2001 From: liuhanqing <447067298@qq.com> Date: Tue, 2 Feb 2021 22:20:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/enums/NoticeExceptionEnum.java | 3 +- .../{ => request}/SysNoticeRequest.java | 2 +- ...ntroller.java => SysNoticeController.java} | 18 +++---- .../modular/service/SysNoticeService.java | 26 +++++----- .../service/impl/SysNoticeServiceImpl.java | 49 +++++++++---------- 5 files changed, 49 insertions(+), 49 deletions(-) rename kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/{ => request}/SysNoticeRequest.java (96%) rename kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/{NoticeController.java => SysNoticeController.java} (84%) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java index ba676b901..cd8fecfe3 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/NoticeExceptionEnum.java @@ -41,7 +41,8 @@ public enum NoticeExceptionEnum implements AbstractExceptionEnum { /** * 通知不存在 */ - NOTICE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "91", "通知不存在"), + NOTICE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "91", "通知不存在，id为：{}"), + /** * 通知范围不允许修改 */ diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/request/SysNoticeRequest.java similarity index 96% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/request/SysNoticeRequest.java index 9c49ac063..f8c341110 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/SysNoticeRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/request/SysNoticeRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.pojo.notice; +package cn.stylefeng.roses.kernel.system.pojo.notice.request; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/NoticeController.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/SysNoticeController.java similarity index 84% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/NoticeController.java rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/SysNoticeController.java index 15ea384f0..a097734bb 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/NoticeController.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/SysNoticeController.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.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.pojo.notice.request.SysNoticeRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; @@ -20,10 +20,10 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @ApiResource(name = "通知管理") -public class NoticeController { +public class SysNoticeController { @Autowired - private SysNoticeService sysResourceService; + private SysNoticeService sysNoticeService; /** @@ -34,7 +34,7 @@ public class NoticeController { */ @PostResource(name = "添加通知管理", path = "/sysNotice/add") public ResponseData add(@RequestBody @Validated(SysNoticeRequest.add.class) SysNoticeRequest sysNoticeParam) { - sysResourceService.add(sysNoticeParam); + sysNoticeService.add(sysNoticeParam); return new SuccessResponseData(); } @@ -46,7 +46,7 @@ public class NoticeController { */ @PostResource(name = "编辑通知管理", path = "/sysNotice/edit") public ResponseData edit(@RequestBody @Validated(SysNoticeRequest.edit.class) SysNoticeRequest sysNoticeParam) { - sysResourceService.edit(sysNoticeParam); + sysNoticeService.edit(sysNoticeParam); return new SuccessResponseData(); } @@ -59,7 +59,7 @@ public class NoticeController { */ @PostResource(name = "删除通知管理", path = "/sysNotice/delete") public ResponseData delete(@RequestBody @Validated(SysNoticeRequest.delete.class) SysNoticeRequest sysNoticeParam) { - sysResourceService.delete(sysNoticeParam); + sysNoticeService.del(sysNoticeParam); return new SuccessResponseData(); } @@ -71,7 +71,7 @@ public class NoticeController { */ @GetResource(name = "查看通知管理", path = "/sysNotice/detail") public ResponseData detail(@Validated(SysNoticeRequest.detail.class) SysNoticeRequest sysNoticeParam) { - return new SuccessResponseData(sysResourceService.detail(sysNoticeParam)); + return new SuccessResponseData(sysNoticeService.detail(sysNoticeParam)); } /** @@ -82,7 +82,7 @@ public class NoticeController { */ @GetResource(name = "查询通知管理", path = "/sysNotice/page") public ResponseData page(SysNoticeRequest sysNoticeParam) { - return new SuccessResponseData(sysResourceService.page(sysNoticeParam)); + return new SuccessResponseData(sysNoticeService.findPage(sysNoticeParam)); } /** @@ -93,6 +93,6 @@ public class NoticeController { */ @GetResource(name = "通知管理列表", path = "/sysNotice/list") public ResponseData list(SysNoticeRequest sysNoticeParam) { - return new SuccessResponseData(sysResourceService.list(sysNoticeParam)); + return new SuccessResponseData(sysNoticeService.findList(sysNoticeParam)); } } \ No newline at end of file diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java index 5e6cc2b08..3b770b072 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java @@ -3,7 +3,7 @@ package cn.stylefeng.roses.kernel.notice.modular.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.notice.modular.entity.SysNotice; import cn.stylefeng.roses.kernel.system.NoticeServiceApi; -import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.pojo.notice.request.SysNoticeRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -19,60 +19,60 @@ public interface SysNoticeService extends IService, NoticeServiceApi /** * 添加系统应用 * - * @param SysNoticeParam 添加参数 + * @param sysNoticeRequest 添加参数 * @author liuhanqing * @date 2021/1/9 14:57 */ - void add(SysNoticeRequest SysNoticeParam); + void add(SysNoticeRequest sysNoticeRequest); /** * 编辑系统应用 * - * @param SysNoticeParam 编辑参数 + * @param sysNoticeRequest 编辑参数 * @author liuhanqing * @date 2021/1/9 14:58 */ - void edit(SysNoticeRequest SysNoticeParam); + void edit(SysNoticeRequest sysNoticeRequest); /** * 删除系统应用 * - * @param SysNoticeParam 删除参数 + * @param sysNoticeRequest 删除参数 * @author liuhanqing * @date 2021/1/9 14:57 */ - void delete(SysNoticeRequest SysNoticeParam); + void del(SysNoticeRequest sysNoticeRequest); /** * 查看系统应用 * - * @param SysNoticeParam 查看参数 + * @param sysNoticeRequest 查看参数 * @return 系统应用 * @author liuhanqing * @date 2021/1/9 14:56 */ - SysNotice detail(SysNoticeRequest SysNoticeParam); + SysNotice detail(SysNoticeRequest sysNoticeRequest); /** * 查询系统应用 * - * @param SysNoticeParam 查询参数 + * @param sysNoticeRequest 查询参数 * @return 查询分页结果 * @author liuhanqing * @date 2021/1/9 14:56 */ - PageResult page(SysNoticeRequest SysNoticeParam); + PageResult findPage(SysNoticeRequest sysNoticeRequest); /** * 系统应用列表 * - * @param SysNoticeParam 查询参数 + * @param sysNoticeRequest 查询参数 * @return 系统应用列表 * @author liuhanqing * @date 2021/1/9 14:56 */ - List list(SysNoticeRequest SysNoticeParam); + List findList(SysNoticeRequest sysNoticeRequest); } \ No newline at end of file diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java index ab90ee588..26dd67c2f 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java +++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java @@ -8,14 +8,14 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.message.api.MessageApi; import cn.stylefeng.roses.kernel.message.api.enums.MessageBusinessTypeEnum; -import cn.stylefeng.roses.kernel.message.api.pojo.MessageSendParam; +import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest; import cn.stylefeng.roses.kernel.notice.modular.entity.SysNotice; import cn.stylefeng.roses.kernel.notice.modular.mapper.SysNoticeMapper; import cn.stylefeng.roses.kernel.notice.modular.service.SysNoticeService; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; -import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; +import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.NoticeExceptionEnum; -import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.pojo.notice.request.SysNoticeRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -45,7 +45,7 @@ public class SysNoticeServiceImpl extends ServiceImpl queryWrapper = this.createWrapper(sysNoticeRequest); + return this.getOne(queryWrapper, false); } @Override - public PageResult page(SysNoticeRequest sysNoticeRequest) { + public PageResult findPage(SysNoticeRequest sysNoticeRequest) { LambdaQueryWrapper wrapper = createWrapper(sysNoticeRequest); Page page = this.page(PageFactory.defaultPage(), wrapper); return PageResultFactory.createPageResult(page); } @Override - public List list(SysNoticeRequest sysNoticeRequest) { + public List findList(SysNoticeRequest sysNoticeRequest) { LambdaQueryWrapper wrapper = createWrapper(sysNoticeRequest); return this.list(wrapper); } @@ -130,10 +131,10 @@ public class SysNoticeServiceImpl extends ServiceImpl createWrapper(SysNoticeRequest sysNoticeRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (ObjectUtil.isNotNull(sysNoticeRequest)) { - // 根据id查询 - if (ObjectUtil.isNotEmpty(sysNoticeRequest.getNoticeId())) { - queryWrapper.eq(SysNotice::getNoticeId, sysNoticeRequest.getNoticeId()); - } - // 根据消息标题模糊查询 - if (ObjectUtil.isNotEmpty(sysNoticeRequest.getNoticeTitle())) { - queryWrapper.like(SysNotice::getNoticeTitle, sysNoticeRequest.getNoticeTitle()).or().like(SysNotice::getNoticeSummary, sysNoticeRequest.getNoticeTitle()).or().like(SysNotice::getNoticeContent, sysNoticeRequest.getNoticeTitle()); - } + // 通知id + Long noticeId = sysNoticeRequest.getNoticeId(); - } + // 通知标题 + String noticeTitle = sysNoticeRequest.getNoticeTitle(); + + // 拼接sql 条件 + queryWrapper.like(ObjectUtil.isNotEmpty(noticeTitle), SysNotice::getNoticeTitle, noticeTitle); + queryWrapper.eq(ObjectUtil.isNotEmpty(noticeId), SysNotice::getNoticeId, noticeId); // 查询未删除状态的 queryWrapper.eq(SysNotice::getDelFlag, YesOrNotEnum.N.getCode());