From c869c7fcff24c894292f1b2660aaf02d5b724d2a Mon Sep 17 00:00:00 2001 From: liuhanqing <447067298@qq.com> Date: Sun, 10 Jan 2021 18:00:31 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90notice=E3=80=91=E5=A2=9E=E5=8A=A0n?= =?UTF-8?q?otice=E5=BC=95=E7=94=A8message=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-s-system/system-business-notice/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel-s-system/system-business-notice/pom.xml b/kernel-s-system/system-business-notice/pom.xml index ac0f09390..296954e47 100644 --- a/kernel-s-system/system-business-notice/pom.xml +++ b/kernel-s-system/system-business-notice/pom.xml @@ -53,11 +53,12 @@ org.springframework.boot spring-boot-starter-web + + cn.stylefeng.roses - message-api + message-spring-boot-starter 1.0.0 - compile From acfcef2ce8ee34dfa45c9357a77576b568c1589f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=BA=86?= <1576331433@qq.com> Date: Mon, 11 Jan 2021 20:22:40 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90file=E3=80=91=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E5=92=8Csql=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/pojo/request/SysFileInfoRequest.java | 5 ++++ .../response/SysFileInfoListResponse.java | 21 +++++++++++++ .../file/modular/entity/SysFileInfo.java | 9 ++++++ .../mapper/mapping/SysFileInfoMapper.xml | 30 +++++++++---------- 4 files changed, 50 insertions(+), 15 deletions(-) diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java index 2757bee88..3a0fdea66 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java @@ -86,6 +86,11 @@ public class SysFileInfoRequest extends BaseRequest { */ private String filePath; + /** + * 文件应用编码 + */ + private String fileAppCode; + /** * 版本回退 */ diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java index 6c934573c..6276f7f51 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java @@ -20,6 +20,21 @@ public class SysFileInfoListResponse implements Serializable { */ private Long fileId; + /** + * 文件编码 + *

+ * 解决一个文件多个版本问题，多次上传文件编码不变 + *

+ * 版本号升级的依据，code相同id不同视为同一个文件的不同版本 + */ + private Long fileCode; + + + /** + * 是否为机密文件 + */ + private String secretFlag; + /** * 文件应用Code名称 */ @@ -30,6 +45,12 @@ public class SysFileInfoListResponse implements Serializable { */ private String fileOriginName; + + /** + * 文件存储位置：1-阿里云，2-腾讯云，3-minio，4-本地 + */ + private Integer fileLocation; + /** * 文件后缀 */ diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java index fbce6119d..6478c0dbc 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/entity/SysFileInfo.java @@ -107,4 +107,13 @@ public class SysFileInfo extends BaseEntity { @TableField("del_flag") private String delFlag; + + + /** + * 文件应用Code名称 + */ + @TableField(value = "file_app_code") + private String fileAppCodeName; + + } diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml index 43368c120..c7ce9a4d6 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml @@ -28,27 +28,27 @@ From cade0ff94ef7f50218c5c77fda7589fa2338aebe Mon Sep 17 00:00:00 2001 From: liuhanqing <447067298@qq.com> Date: Mon, 11 Jan 2021 20:53:26 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90notice\message=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0message=E6=B6=88=E6=81=AF=E6=9C=AA=E8=AF=BB=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/message/api/MessageApi.java | 21 +++++++++++++++++++ .../controller/SysMessageController.java | 18 ++++++++++++++++ .../message/db/MessageDbServiceImpl.java | 15 +++++++++++++ .../message/db/service/SysMessageService.java | 9 ++++++++ .../service/impl/SysMessageServiceImpl.java | 6 ++++++ 5 files changed, 69 insertions(+) diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java index 19d57848e..f6823ff49 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/MessageApi.java @@ -121,4 +121,25 @@ public interface MessageApi { */ List queryListCurrentUser(MessageParam messageParam); + /** + * 查询系统消息数量 + * + * @param messageParam 查询参数 + * @return 系统消息数量 + * @author liuhanqing + * @date 2021/1/11 21:21 + */ + Integer queryCount(MessageParam messageParam); + + /** + * 查询系统消息数量，当前登录用户 + * + * @param messageParam 查询参数 + * @return 系统消息数量 + * @author liuhanqing + * @date 2021/1/11 21:21 + */ + Integer queryCountCurrentUser(MessageParam messageParam); + + } \ No newline at end of file diff --git a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java index 8e2d78ce8..a56de2553 100644 --- a/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java +++ b/kernel-s-message/message-business/src/main/java/cn/stylefeng/roses/kernel/message/modular/manage/controller/SysMessageController.java @@ -15,7 +15,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 系统消息控制器 @@ -117,4 +119,20 @@ public class SysMessageController { return new SuccessResponseData(messageApi.queryListCurrentUser(messageParam)); } + + /** + * 系统消息未读数量 + * + * @author liuhanqing + * @date 2021/1/11 19:50 + */ + @GetResource(name = "系统消息列表", path = "/sysMessage/unReadCount") + public ResponseData msgUnRead(MessageParam messageParam) { + messageParam.setReadFlag(MessageReadFlagEnum.UNREAD.getCode()); + Integer messageCount = messageApi.queryCountCurrentUser(messageParam); + Map msgMap = new HashMap<>(1); + msgMap.put("msgUnReadCount", messageCount); + return new SuccessResponseData(messageApi.queryListCurrentUser(messageParam)); + } + } diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java index b844904a2..e91c05e60 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/MessageDbServiceImpl.java @@ -194,4 +194,19 @@ public class MessageDbServiceImpl implements MessageApi { messageParam.setReceiveUserId(loginUser.getUserId()); return this.queryList(messageParam); } + + @Override + public Integer queryCount(MessageParam messageParam) { + return sysMessageService.count(messageParam); + } + @Override + public Integer queryCountCurrentUser(MessageParam messageParam) { + if (ObjectUtil.isEmpty(messageParam)) { + messageParam = new MessageParam(); + } + // 获取当前登录人 + LoginUser loginUser = LoginContext.me().getLoginUser(); + messageParam.setReceiveUserId(loginUser.getUserId()); + return this.queryCount(messageParam); + } } diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java index 3319e77cb..153a99a18 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/SysMessageService.java @@ -31,4 +31,13 @@ public interface SysMessageService extends IService { * @date 2021/1/8 15:21 */ List list(MessageParam messageParam); + + /** + * 数量查询 + * + * @param messageParam 参数 + * @author liuhanqing + * @date 2021/1/11 19:21 + */ + Integer count(MessageParam messageParam); } diff --git a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java index a77299cf7..1ebffd58b 100644 --- a/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java +++ b/kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java @@ -38,6 +38,12 @@ public class SysMessageServiceImpl extends ServiceImpl wrapper = createWrapper(messageParam); return this.list(wrapper); } + @Override + public Integer count(MessageParam messageParam) { + LambdaQueryWrapper wrapper = createWrapper(messageParam); + return this.count(wrapper); + } + /** * 创建wrapper * From d144158a9ea309664d2b349fa3536f998d58d0ec Mon Sep 17 00:00:00 2001 From: liuhanqing <447067298@qq.com> Date: Tue, 12 Jan 2021 21:54:26 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90notice\message=E3=80=91message=20?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/api/pojo/MessageResponse.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java index 795470203..511c2b2ba 100644 --- a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java +++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/pojo/MessageResponse.java @@ -1,9 +1,13 @@ package cn.stylefeng.roses.kernel.message.api.pojo; +import cn.stylefeng.roses.kernel.message.api.enums.MessageProrityLevelEnum; +import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; /** * 系统消息的查询参数 @@ -69,4 +73,29 @@ public class MessageResponse implements Serializable { */ private Integer readFlag; + /** + * 消息优先级 + */ + private String priorityLevelValue; + + /** + * 阅读状态：0-未读，1-已读 + */ + private String readFlagValue; + + public String getPriorityLevelValue(){ + AtomicReference value = new AtomicReference<>(""); + Optional.ofNullable(this.priorityLevel).ifPresent(val ->{ + value.set(MessageProrityLevelEnum.getName(this.priorityLevel)); + }); + return value.get(); + } + + public String getReadFlagValue(){ + AtomicReference value = new AtomicReference<>(""); + Optional.ofNullable(this.readFlag).ifPresent(val ->{ + value.set(MessageReadFlagEnum.getName(this.readFlag)); + }); + return value.get(); + } } From 0902b7e6813d3f950027942bafbfddbe7dcad043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=BA=86?= <1576331433@qq.com> Date: Tue, 12 Jan 2021 22:38:45 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90file=E3=80=91=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BAfileBucket=E3=80=81fileObje?= =?UTF-8?q?ctName=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/pojo/response/SysFileInfoListResponse.java | 11 +++++++++++ .../file/modular/mapper/mapping/SysFileInfoMapper.xml | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java index 6276f7f51..fd41ce075 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java @@ -30,6 +30,17 @@ public class SysFileInfoListResponse implements Serializable { private Long fileCode; + /** + * 文件仓库（文件夹） + */ + private String fileBucket; + + + /** + * 存储到bucket中的名称，主键id+.后缀 + */ + private String fileObjectName; + /** * 是否为机密文件 */ diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml index c7ce9a4d6..de13bc2e1 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml @@ -27,10 +27,12 @@ SELECT file.file_id AS fileId, file.file_code AS fileCode, - file.file_app_code AS fileAppCode, file.secret_flag AS secretFlag, file.file_bucket AS fileBucket, file.file_object_name AS fileObjectName, - app.app_name AS fileAppCodeName, file.file_location AS fileLocation, file.file_origin_name AS fileOriginName, file.file_suffix AS fileSuffix, @@ -43,12 +40,8 @@ file.create_time AS createTime, file.del_flag AS delFlag FROM sys_file_info file - LEFT JOIN sys_app app ON file.file_app_code = app.app_code LEFT JOIN sys_user user ON user.user_id = file.create_user - - AND file.file_app_code = #{sysFileInfoRequest.fileAppCode} - AND file.file_origin_name LIKE CONCAT('%',#{sysFileInfoRequest.fileOriginName},'%') From 3d0ecbd9c3b31d75721e1264f287b693c6cb1f00 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 13 Jan 2021 13:29:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90menu=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/modular/service/impl/SysMenuButtonServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java index 05386f474..6b76ca855 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java @@ -132,8 +132,6 @@ public class SysMenuButtonServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>();