diff --git a/zyplayer-doc-core/pom.xml b/zyplayer-doc-core/pom.xml
index 27b5dd71..4c41f00e 100644
--- a/zyplayer-doc-core/pom.xml
+++ b/zyplayer-doc-core/pom.xml
@@ -54,8 +54,8 @@
com.baomidou
- mybatis-plus-core
- 3.3.0
+ mybatis-plus
+ 3.0.6
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java
index 861d46c4..948fb3a7 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java
@@ -37,8 +37,8 @@ public class UserMessageServiceImpl extends ServiceImpl page = new Page<>(pageNum, pageSize);
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq("accept_user_id", currentUser.getUserId());
- if (msgStatus != null && msgStatus >= 0) {
- wrapper.eq("msg_status", msgStatus);
- }
+ wrapper.orderByAsc("msg_status").orderByDesc("creation_time");
+// if (msgStatus != null && msgStatus >= 0) {
+// wrapper.eq("msg_status", msgStatus);
+// }
+ wrapper.notIn("msg_status", 2);
userMessageService.page(page, wrapper);
return DocResponseJson.ok(page);
}
@@ -83,6 +86,9 @@ public class UserMessageController {
* @param status 状态
*/
public void update(String ids, Integer status) {
+ if (StringUtils.isBlank(ids)) {
+ return;
+ }
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.in("id", Arrays.asList(ids.split(",")));
diff --git a/zyplayer-doc-manage/src/main/resources/application.yml b/zyplayer-doc-manage/src/main/resources/application.yml
index a50da131..c4f89540 100644
--- a/zyplayer-doc-manage/src/main/resources/application.yml
+++ b/zyplayer-doc-manage/src/main/resources/application.yml
@@ -42,7 +42,7 @@ zyplayer:
# ------WIKI文档相关------
wiki:
# WIKI文档的文件上传后的存储目录，！！截图或文件还是很重要的，建议您还要定期备份此目录的文件呢！！
- upload-path: e:/zyplayerDoc/wikiFiles
+ upload-path: d:/zyplayerDoc/wikiFiles
# 是否检查目录有被系统定期清理的风险，强烈建议开启
upload-path-check: true
# ------swagger相关配置------
diff --git a/zyplayer-doc-ui/wiki-ui/.env.development b/zyplayer-doc-ui/wiki-ui/.env.development
index fb7181ed..58e9a01d 100644
--- a/zyplayer-doc-ui/wiki-ui/.env.development
+++ b/zyplayer-doc-ui/wiki-ui/.env.development
@@ -2,8 +2,8 @@
ENV = 'development'
# base api
-# VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage'
-VUE_APP_BASE_API = 'http://doc.zyplayer.com/zyplayer-doc-manage'
+VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage'
+# VUE_APP_BASE_API = 'http://doc.zyplayer.com/zyplayer-doc-manage'
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/zyplayer-doc-ui/wiki-ui/src/common/api/user.js b/zyplayer-doc-ui/wiki-ui/src/common/api/user.js
index 50505450..70ca4634 100644
--- a/zyplayer-doc-ui/wiki-ui/src/common/api/user.js
+++ b/zyplayer-doc-ui/wiki-ui/src/common/api/user.js
@@ -17,6 +17,15 @@ export default {
getUserBaseInfo: data => {
return request({url: '/zyplayer-doc-wiki/common/user/base', method: 'post', data: Qs.stringify(data)});
},
+ getUserMessageList: data => {
+ return request({url: '/user/message/list', method: 'post', data: Qs.stringify(data)});
+ },
+ readUserMessage: data => {
+ return request({url: '/user/message/read', method: 'post', data: Qs.stringify(data)});
+ },
+ deleteUserMessage: data => {
+ return request({url: '/user/message/delete', method: 'post', data: Qs.stringify(data)});
+ },
};
// userLogin: '/login',
diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue b/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue
index 3049dfa6..348a3868 100644
--- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue
@@ -33,9 +33,42 @@
+
+
+
+
+
+ 通知
+ 本页标记已读
+
+
+
-
+
控制台
关于
@@ -179,12 +212,21 @@
wikiPageExpandedKeys: [],
// 升级信息
upgradeInfo: {},
+ userMessageList: [],
+ haveNotReadUserMessage: false,
+ userMessagePopVisible: false,
+ userMsgTotalCount: 0,
+ userMsgParam: {
+ pageNum: 1,
+ pageSize: 5,
+ },
}
},
computed: {
},
mounted: function () {
this.loadSpaceList();
+ this.loadUserMessageList();
this.checkSystemUpgrade();
},
methods: {
@@ -235,8 +277,41 @@
pageApi.pageChangeParent(param).then(res => {
this.doGetPageList(null);
});
- },
- filterPageNode(value, data) {
+ },
+ loadUserMessageList() {
+ userApi.getUserMessageList(this.userMsgParam).then(res => {
+ this.userMessageList = res.data || [];
+ this.userMsgTotalCount = res.total || 0;
+ this.haveNotReadUserMessage = (this.userMessageList.filter(item => item.msgStatus == 0).length) > 0;
+ });
+ },
+ showUserMessage(row) {
+ if (row.msgStatus == 0) {
+ userApi.readUserMessage({ids: row.id}).then(() => {
+ this.loadUserMessageList();
+ });
+ }
+ if (row.msgType >= 2 && row.msgType <= 11) {
+ this.$router.push({path: '/page/show', query: {pageId: row.dataId}});
+ this.userMessagePopVisible = false;
+ }
+ },
+ readAllUserMessage() {
+ let msgIds = [];
+ this.userMessageList.filter(item => item.msgStatus == 0).forEach(item => {
+ msgIds.push(item.id);
+ });
+ if (msgIds.length <= 0) return;
+ userApi.readUserMessage({ids: msgIds.join(',')}).then(() => {
+ this.$message.success("标记成功");
+ this.loadUserMessageList();
+ });
+ },
+ handleCurrentChange(val) {
+ this.userMsgParam.pageNum = val;
+ this.loadUserMessageList();
+ },
+ filterPageNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
@@ -437,4 +512,6 @@
.el-header {color: #333; line-height: 40px; text-align: right;height: 40px !important;}
.icon-collapse{float: left;font-size: 25px;color: #aaa;margin-top: 8px;cursor: pointer;}
.icon-collapse:hover{color: #eee;}
+ .head-icon{margin-right: 15px; font-size: 16px;cursor: pointer;color: #fff;}
+ .header-user-message .page-info-box{text-align: right;margin-top: 10px;}