From 2f200dba62b41912bd674cca83740392d58759cb Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 30 Apr 2020 10:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    |  4 ++--
 .../epmet/modules/utils/ModuleConstant.java   | 24 -------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index e51867fab7..1f4de40742 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -545,7 +545,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//发送消息
 		UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
 		userMessageFormDTO.setUserId(resiGroupDTO.getCreatedBy());
-		userMessageFormDTO.setTitle(ModuleConstant.AUDITED_GROUP_APPLYING_TITLE);
+		userMessageFormDTO.setTitle(UserMessageConstant.AUDITED_GROUP_APPLYING_TITLE);
 		userMessageFormDTO.setReadFlag(ModuleConstant.UNREAD);
 		userMessageFormDTO.setApp(ModuleConstant.APP_RESI);
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
@@ -589,7 +589,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//5、给用户发送消息？？？待定
 		UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
 		userMessageFormDTO.setUserId(resiGroupDTO.getCreatedBy());
-		userMessageFormDTO.setTitle(ModuleConstant.AUDITED_GROUP_APPLYING_TITLE);
+		userMessageFormDTO.setTitle(UserMessageConstant.AUDITED_GROUP_APPLYING_TITLE);
 		userMessageFormDTO.setReadFlag(ModuleConstant.UNREAD);
 		userMessageFormDTO.setApp(ModuleConstant.APP_RESI);
 		userMessageFormDTO.setGridId(resiGroupDTO.getGridId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 3157be04ef..b54a19bb87 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -230,11 +230,6 @@ public interface ModuleConstant extends Constant {
 
 	String UNKNOWN = "未知";
 
-	/**
-	 * 申请组时的消息模板
-	 */
-	String CREATION_OF_GROUP_MESSAGE_TEMPLATE = "%s%s申请创建小组【%s】，请审核。";
-
 	/**
 	 * 工作人员角色key：管理员
 	 * */
@@ -250,23 +245,4 @@ public interface ModuleConstant extends Constant {
 	 */
 	String FAILED_SEND_MESSAGE = "消息发送失败，消息内容:【%s】";
 
-	/**
-	 * 申请建组消息名称
-	 * */
-	String CREATE_GROUP_APPLYING_MSG_TITLE = "您有一条建组申请消息";
-
-	/**
-	 * 建组审核驳回时消息模板
-	 * */
-	String DISAGREE_CREATING_GROUP_MSG = "您好，您申请的%s小组，由于不符合%s条件的原因，已被驳回。";
-
-	/**
-	 * 建组审核同意时消息模板
-	 * */
-	String AGREE_CREATING_GROUP_MSG = "您好，您申请的%s小组，已审核通过。";
-
-	/**
-	 * 审核建组申请消息名称
-	 * */
-	String AUDITED_GROUP_APPLYING_TITLE = "您有一条建组审核消息";
 }