评论的展示、已读及跳转，消息接口优化

zyplayer-doc-core/pom.xml

@@ -54,8 +54,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-core</artifactId>
+			<artifactId>mybatis-plus</artifactId>
-			<version>3.3.0</version>
+			<version>3.0.6</version>
 		</dependency>
 	</dependencies>
 </project>

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java

@@ -37,8 +37,8 @@ public class UserMessageServiceImpl extends ServiceImpl<UserMessageMapper, UserM
 	
 	@Override
 	public void addWikiMessage(UserMessage userMessage) {
-		// 初始值
+		// 初始值，操作人的消息默认为已读
-		userMessage.setMsgStatus(0);
+		userMessage.setMsgStatus(1);
 		userMessage.setCreationTime(new Date());
 		// 操作人
 		userMessage.setAcceptUserId(userMessage.getOperatorUserId());
@@ -47,6 +47,8 @@ public class UserMessageServiceImpl extends ServiceImpl<UserMessageMapper, UserM
 		// 影响人
 		if (userMessage.getAffectUserId() != null && !Objects.equals(userMessage.getAffectUserId(), userMessage.getOperatorUserId())) {
 			userMessage.setId(null);
+			// 收影响人的消息为未读
+			userMessage.setMsgStatus(0);
 			userMessage.setAcceptUserId(userMessage.getAffectUserId());
 			this.setWikiMsgContentForAffect(userMessage);
 			this.save(userMessage);
@@ -61,23 +63,23 @@ public class UserMessageServiceImpl extends ServiceImpl<UserMessageMapper, UserM
 	 */
 	private void setWikiMsgContentForOperator(UserMessage userMessage) {
 		if (Objects.equals(UserMsgType.WIKI_PAGE_UPLOAD.getType(), userMessage.getMsgType())) {
-			userMessage.setMsgContent(String.format("您在‘%s’文档内上传了附件", userMessage.getDataDesc()));
+			userMessage.setMsgContent(String.format("您在‘%s’文档内上传了一个附件", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_AUTH.getType(), userMessage.getMsgType())) {
 			userMessage.setMsgContent(String.format("您修改了‘%s’文档内‘%s’的权限", userMessage.getDataDesc(), userMessage.getAffectUserName()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_COMMENT.getType(), userMessage.getMsgType())) {
-			userMessage.setMsgContent(String.format("您评论了‘%s’文档", userMessage.getDataDesc()));
+			userMessage.setMsgContent(String.format("您评论了‘%s’", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_COMMENT_DEL.getType(), userMessage.getMsgType())) {
 			userMessage.setMsgContent(String.format("您删除了‘%s’文档的评论", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_PARENT.getType(), userMessage.getMsgType())) {
 			userMessage.setMsgContent(String.format("您修改了‘%s’文档的父级", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_DELETE.getType(), userMessage.getMsgType())) {
-			userMessage.setMsgContent(String.format("您删除了‘%s’文档", userMessage.getDataDesc()));
+			userMessage.setMsgContent(String.format("您删除了‘%s’", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_CREATE.getType(), userMessage.getMsgType())) {
-			userMessage.setMsgContent(String.format("您创建了‘%s’文档", userMessage.getDataDesc()));
+			userMessage.setMsgContent(String.format("您创建了‘%s’", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_UPDATE.getType(), userMessage.getMsgType())) {
-			userMessage.setMsgContent(String.format("您修改了‘%s’文档", userMessage.getDataDesc()));
+			userMessage.setMsgContent(String.format("您修改了‘%s’", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_ZAN.getType(), userMessage.getMsgType())) {
-			userMessage.setMsgContent(String.format("您赞同了‘%s’文档", userMessage.getDataDesc()));
+			userMessage.setMsgContent(String.format("您赞同了‘%s’", userMessage.getDataDesc()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_FILE_DEL.getType(), userMessage.getMsgType())) {
 			userMessage.setMsgContent(String.format("您删除了‘%s’文档的一个附件", userMessage.getDataDesc()));
 		}

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserMessageController.java

@@ -10,6 +10,7 @@ import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
 import com.zyplayer.doc.data.service.manage.UserMessageService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -45,9 +46,11 @@ public class UserMessageController {
 		IPage<UserMessage> page = new Page<>(pageNum, pageSize);
 		QueryWrapper<UserMessage> wrapper = new QueryWrapper<>();
 		wrapper.eq("accept_user_id", currentUser.getUserId());
-		if (msgStatus != null && msgStatus >= 0) {
+		wrapper.orderByAsc("msg_status").orderByDesc("creation_time");
-			wrapper.eq("msg_status", msgStatus);
+//		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<UserMessage> wrapper = new QueryWrapper<>();
 		wrapper.in("id", Arrays.asList(ids.split(",")));

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相关配置------

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://local.zyplayer.com:8083/zyplayer-doc-manage'
-VUE_APP_BASE_API = 'http://doc.zyplayer.com/zyplayer-doc-manage'
+# VUE_APP_BASE_API = 'http://doc.zyplayer.com/zyplayer-doc-manage'
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

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',

zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue

@@ -33,9 +33,42 @@
                 <el-header>
                     <!--<el-switch v-model="isCollapse" ></el-switch>-->
                     <i class="el-icon-menu icon-collapse" @click="leftCollapse = !leftCollapse"></i>
+					<el-popover placement="bottom" width="600" trigger="click" v-model="userMessagePopVisible">
+						<el-badge :is-dot="haveNotReadUserMessage" slot="reference" style="line-height: 20px;margin-right: 20px;">
+							<i class="el-icon-bell head-icon" @click="" style="margin-right: 0;"></i>
+						</el-badge>
+						<div style="margin-bottom: 10px;">
+							<span style="font-size: 14px;font-weight: bold;">通知</span>
+							<el-link v-if="haveNotReadUserMessage" type="primary" icon="el-icon-check" style="float: right;" v-on:click="readAllUserMessage">本页标记已读</el-link>
+						</div>
+						<div class="header-user-message">
+							<el-table :data="userMessageList" border style="width: 100%; margin-bottom: 5px;" max-height="500" size="mini">
+								<el-table-column prop="operatorUserName" label="操作人" width="100px"></el-table-column>
+								<el-table-column prop="creationTime" label="操作时间" width="140px"></el-table-column>
+								<el-table-column label="内容">
+									<template slot-scope="scope">
+										{{scope.row.msgContent}}
+										<el-badge :is-dot="scope.row.msgStatus==0" slot="reference" style="line-height: 10px;padding-right: 5px;">
+											<el-link type="primary" v-on:click="showUserMessage(scope.row)">查看></el-link>
+										</el-badge>
+									</template>
+								</el-table-column>
+							</el-table>
+							<div class="page-info-box">
+								<el-pagination
+									@current-change="handleCurrentChange"
+									:page-size="userMsgParam.pageSize"
+									:current-page="userMsgParam.pageNum"
+									layout="prev, pager, next, jumper, total"
+									:total="userMsgTotalCount"
+								>
+								</el-pagination>
+							</div>
+						</div>
+					</el-popover>
                     <!--<div class="logo" @click="aboutDialogVisible = true">zyplayer-doc-wiki</div>-->
                     <el-dropdown @command="userSettingDropdown" trigger="click">
-                        <i class="el-icon-setting" style="margin-right: 15px; font-size: 16px;cursor: pointer;color: #fff;"> </i>
+                        <i class="el-icon-setting head-icon"></i>
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item command="console">控制台</el-dropdown-item>
                             <el-dropdown-item command="aboutDoc" divided>关于</el-dropdown-item>
@@ -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;}
 </style>