From 568ecb96e91791f52deca7117a04edfc8306433c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 29 Oct 2020 09:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=BE=AE=E4=BF=A1=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/WorkActServiceImpl.java    | 1 +
 .../com/epmet/service/impl/WorkActUserServiceImpl.java     | 1 +
 .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 1 +
 .../com/epmet/service/impl/ProjectProcessServiceImpl.java  | 7 ++++++-
 .../java/com/epmet/service/impl/ProjectServiceImpl.java    | 2 ++
 .../java/com/epmet/service/impl/ArticleServiceImpl.java    | 4 ++++
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
index 68915220c9..95b1afaa41 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
@@ -710,6 +710,7 @@ public class WorkActServiceImpl implements WorkActService {
             if(sendMessageRes.success()){
                 logger.info("给审核通过的用户发送消息成功");
             }
+            logger.info("取消活动，开始推送微信订阅消息");
             Result wxmpMsg = epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
             if (wxmpMsg.success()) {
                 logger.info("给审核通过的用户推送微信订阅消息成功");
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
index 9e58336c61..735c82dda1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
@@ -671,6 +671,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
                 msg.setMessageContent(String.format(ActMessageConstant.AUDIT_REFUSED, actInfo.getTitle(), actUserRelationEntity.getFailureReason()));
             }
             list.add(msg);
+            logger.info("活动报名审核，开始推送微信订阅消息");
             Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(list);
             if (result.success()) {
                 logger.info("审核成功，已成功发送微信订阅消息");
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 2a72c38dc7..f2e814a0a4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -496,6 +496,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             msgIssue.setUserId(entity.getCreatedBy());
             msgList.add(msgIssue);
         }
+        logger.info("议题关闭，开始推送微信订阅消息");
         return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index 5d73eb379a..92910e6d06 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -55,6 +55,8 @@ import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectStaffService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -72,6 +74,7 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao, ProjectProcessEntity> implements ProjectProcessService {
 
+    protected static final Logger logger = LoggerFactory.getLogger(ProjectProcessServiceImpl.class);
     @Autowired
     private ProjectProcessRedis projectProcessRedis;
     @Autowired
@@ -294,7 +297,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
 
         //5:调用epmet-message服务，给项目流转过程中的工作人员发送订阅的微信消息
         if (!transferWxmpMessage(formDTO).success()) {
-            throw new RenException(ProjectConstant.SAVE_WXMP_MSG_EXCEPTION);
+            logger.error("项目流转，推送微信订阅消息失败");
+            //throw new RenException(ProjectConstant.SAVE_WXMP_MSG_EXCEPTION);
         }
     }
 
@@ -356,6 +360,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
                 map.put(staff.getStaffId(),staff.getStaffId());
             }
         });
+        logger.info("项目流转，推送微信订阅消息");
         return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 4fc6b42d22..9658d05a9f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -436,6 +436,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		});
 		messageFeignClient.saveUserMessageList(msgList);
 		//2020.10.26  发送微信订阅消息  sun
+		logger.info("项目结案，开始推送微信订阅消息");
 		Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);
 		if (!result.success()) {
 			logger.error("项目结案成功，发送微信订阅消息失败" + JSON.toJSONString(result));
@@ -519,6 +520,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		msg.setGridId("*");
 		wxmpMsgList.add(msg);
 		//发送微信订阅消息  sun
+		logger.info("项目退回，开始推送微信订阅消息");
 		Result result = epmetMessageOpenFeignClient.sendWxSubscribeMessage(wxmpMsgList);
 		if (!result.success()) {
 			logger.error("项目退回成功，发送微信订阅消息失败" + JSON.toJSONString(result));
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index e47dc028b9..caeba1dc14 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -58,6 +58,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jsoup.helper.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,6 +81,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntity> implements ArticleService {
+	private Logger logger = LogManager.getLogger(ArticleServiceImpl.class);
 	@Autowired
 	private GovOrgOpenFeignClient govOrgOpenFeignClient;
 	@Autowired
@@ -1191,6 +1194,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		formDTO.setMessageTime(new Date());
 		formDTO.setGridId("*");
 		msgList.add(formDTO);
+		logger.info("发布文章审核，开始推送微信订阅消息");
 		return epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 	}