From 3048d203fffc16f567ea2416c4b959148be83fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Tue, 27 Oct 2020 22:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=BF=85=E8=A6=81=E7=9A=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doc/data/repository/support/consts/UserMsgType.java    | 1 +
 .../data/service/manage/impl/UserMessageServiceImpl.java   | 4 ++++
 .../data/service/manage/impl/WikiPageZanServiceImpl.java   | 2 +-
 .../zyplayer/doc/wiki/controller/WikiPageController.java   | 7 +++++++
 .../doc/wiki/controller/WikiPageZanController.java         | 4 ++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java
index 3fa72240..f585b908 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java
@@ -5,6 +5,7 @@ public enum UserMsgType {
 	// 6=wiki文档评论 7=wiki文档删除评论 8=wiki文档上传附件 9=wiki文档修改了父级 10=wiki文档点赞 11=wiki文档附件删除
 	SIMPLE(1), WIKI_PAGE_CREATE(2), WIKI_PAGE_DELETE(3), WIKI_PAGE_UPDATE(4), WIKI_PAGE_AUTH(5),
 	WIKI_PAGE_COMMENT(6), WIKI_PAGE_COMMENT_DEL(7), WIKI_PAGE_UPLOAD(8), WIKI_PAGE_PARENT(9), WIKI_PAGE_ZAN(10), WIKI_PAGE_FILE_DEL(11),
+	WIKI_PAGE_ZAN_CANCEL(12),
 	;
 	
 	UserMsgType(int type) {
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 948fb3a7..ec6f83ca 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
@@ -82,6 +82,8 @@ public class UserMessageServiceImpl extends ServiceImpl<UserMessageMapper, UserM
 			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()));
+		} else if (Objects.equals(UserMsgType.WIKI_PAGE_ZAN_CANCEL.getType(), userMessage.getMsgType())) {
+			userMessage.setMsgContent(String.format("您取消了对‘%s’文档的赞同", userMessage.getDataDesc()));
 		}
 	}
 	
@@ -109,6 +111,8 @@ public class UserMessageServiceImpl extends ServiceImpl<UserMessageMapper, UserM
 			userMessage.setMsgContent(String.format("您的‘%s’文档收到了‘%s’的赞同", userMessage.getDataDesc(), userMessage.getOperatorUserName()));
 		} else if (Objects.equals(UserMsgType.WIKI_PAGE_FILE_DEL.getType(), userMessage.getMsgType())) {
 			userMessage.setMsgContent(String.format("您的‘%s’文档被‘%s’删除了一个附件", userMessage.getDataDesc(), userMessage.getOperatorUserName()));
+		} else if (Objects.equals(UserMsgType.WIKI_PAGE_ZAN_CANCEL.getType(), userMessage.getMsgType())) {
+			userMessage.setMsgContent(String.format("‘%s’取消了对文档‘%s’的赞同", userMessage.getOperatorUserName(), userMessage.getDataDesc()));
 		}
 	}
 }
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java
index 1af3bc2e..f278b79d 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java
@@ -50,7 +50,7 @@ public class WikiPageZanServiceImpl extends ServiceImpl<WikiPageZanMapper, WikiP
 			wikiPageZan.setCreateUserName(currentUser.getUsername());
 			this.save(wikiPageZan);
 		}
-		int numAdd = wikiPageZan.getYn() == 1 ? 1 : -1;
+		int numAdd = Objects.equals(wikiPageZan.getYn(), 1) ? 1 : -1;
 		wikiPageMapper.updateZanNum(wikiPageZan.getPageId(), numAdd);
 	}
 }
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
index 5cd5fa8b..4224d447 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
@@ -196,6 +196,7 @@ public class WikiPageController {
 		WikiPage wikiPage = new WikiPage();
 		wikiPage.setId(pageId);
 		wikiPage.setDelFlag(1);
+		wikiPage.setName(wikiPageSel.getName());
 		wikiPage.setUpdateTime(new Date());
 		wikiPage.setUpdateUserId(currentUser.getUserId());
 		wikiPage.setUpdateUserName(currentUser.getUsername());
@@ -254,6 +255,12 @@ public class WikiPageController {
 			if (SpaceType.isOthersPersonal(wikiSpaceSel.getType(), currentUser.getUserId(), wikiSpaceSel.getCreateUserId())) {
 				return DocResponseJson.warn("您没有权限新增该空间的文章！");
 			}
+			if (wikiPage.getParentId() != null && wikiPage.getParentId() > 0) {
+				WikiPage wikiPageParent = wikiPageService.getById(wikiPage.getParentId());
+				if (Objects.equals(wikiPage.getSpaceId(), wikiPageParent.getSpaceId())) {
+					return DocResponseJson.warn("当前空间和父页面的空间不一致，请重新选择父页面！");
+				}
+			}
 			Integer lastSeq = wikiPageMapper.getLastSeq(wikiPage.getParentId());
 			lastSeq = Optional.ofNullable(lastSeq).orElse(0);
 			wikiPage.setSeqNo(lastSeq + 1);
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
index 0eea5aba..79fb1810 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 文档控制器
@@ -86,6 +87,9 @@ public class WikiPageZanController {
 		wikiPageZanService.zanPage(wikiPageZan);
 		// 给相关人发送消息
 		UserMessage userMessage = userMessageService.createUserMessage(currentUser, wikiPageSel.getId(), wikiPageSel.getName(), UserMsgSysType.WIKI, UserMsgType.WIKI_PAGE_ZAN);
+		if (!Objects.equals(wikiPageZan.getYn(), 1)) {
+			userMessage.setMsgType(UserMsgType.WIKI_PAGE_ZAN_CANCEL.getType());
+		}
 		userMessage.setAffectUserId(wikiPageSel.getCreateUserId());
 		userMessage.setAffectUserName(wikiPageSel.getCreateUserName());
 		userMessageService.addWikiMessage(userMessage);