From b72f9f8887208eb4719264ff3916e77af9953761 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Sep 2021 14:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E7=BB=99=E7=BD=91=E6=A0=BC=E9=95=BF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E8=AE=B0=E5=BD=95=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E7=94=B3=E8=AF=B7id=E5=88=B0user=5F?=
 =?UTF-8?q?message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/UserMessageDTO.java  |  8 ++++++++
 .../java/com/epmet/dto/form/UserMessageFormDTO.java  | 11 +++++++++--
 .../form/ResiWarmheartedSubmitFormDTO.java           |  5 +++++
 .../impl/ResiWarmheartedApplyServiceImpl.java        | 12 ++++++++++--
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java
index d44c80ae47..2a86b7a7d3 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/UserMessageDTO.java
@@ -109,4 +109,12 @@ public class UserMessageDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 消息分类:info-上传下达消息 详见UserMessageTypeConstant
+     */
+    private String messageType;
+    /**
+     * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情
+     */
+    private String targetId;
 }
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
index e00bb88342..309a1222cc 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java
@@ -1,8 +1,6 @@
 package com.epmet.dto.form;
 
-import lombok.Builder;
 import lombok.Data;
-import net.bytebuddy.implementation.bind.annotation.Default;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -61,4 +59,13 @@ public class UserMessageFormDTO implements Serializable {
 	 * 调用者 【分内部调用和外部调用，内部调用值为空，外部默认为：外挂-站内信】
 	 */
 	private String referer;
+
+	/**
+	 * 消息分类:info-上传下达消息 详见UserMessageTypeConstant
+	 */
+	private String messageType;
+	/**
+	 * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情
+	 */
+	private String targetId;
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
index 38497917d8..61f1c0f8f5 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
@@ -73,4 +73,9 @@ public class ResiWarmheartedSubmitFormDTO implements Serializable {
      */
     private String messageText;
 
+    /**
+     * 无需前端传入，此列用来数据传值
+     */
+    private String applyId;
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 549a5ce8af..f9cda1fe09 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.UserRoleDTO;
@@ -211,7 +212,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 			}
 			formDTO.setMessageText(messageContent);
 			//1:将申请记录存入热心居民申请表中
-			saveResiWarmApply(formDTO);
+			String applyId=saveResiWarmApply(formDTO);
+			formDTO.setApplyId(applyId);
 			//2:将最后一次操作行为更新到热心居民申请行为记录表中
 			resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
 			//3:添加消息信息，给网格长发消息
@@ -234,7 +236,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 	 * @param formDTO
 	 * @return
 	 */
-	public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
+	public String saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
 		ResiWarmheartedApplyEntity entity = new ResiWarmheartedApplyEntity();
 		entity.setCustomerId(formDTO.getCustomerId());
 		entity.setGridId(formDTO.getGridId());
@@ -245,6 +247,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		entity.setReadFlag(ResiWarmheartedVisitConstant.UN_READ);
 		entity.setMessageText(formDTO.getMessageText());
 		baseDao.insert(entity);
+		return entity.getId();
 	}
 	/**
 	 * 热心居民申请像网格长发送消息
@@ -289,6 +292,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 					}
 					msgDTO.setMessageContent(formDTO.getMessageText());
 					msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
+
+					//21.09.10:记录消息类型和对应的业务id
+					msgDTO.setMessageType(UserMessageTypeConstant.WARMHEARTED_APPLY);
+					msgDTO.setTargetId(formDTO.getApplyId());
+
 					msgList.add(msgDTO);
 					//微信订阅
 					WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();