From e46f7c1a0f72b69c9b53a6958c6593a25ab4b2b9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 14 Apr 2020 11:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=9D=A1=E6=B6=88=E6=81=AF=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BBbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/mine/dto/from/ReadMessageFromDTO.java   | 16 ++++++++++++++++
 .../controller/UserMessageController.java        | 14 ++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java

diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java
new file mode 100644
index 0000000000..932f38fa18
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/ReadMessageFromDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/14 11:01
+ */
+@Data
+public class ReadMessageFromDTO implements Serializable {
+	private static final long serialVersionUID = 1116253566756531198L;
+	private String messageId;
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
index d0c75c990c..2af9dfb554 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
@@ -7,8 +7,12 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
 import com.epmet.modules.message.service.UserMessageService;
+import com.epmet.resi.mine.dto.from.ReadMessageFromDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -40,18 +44,16 @@ public class UserMessageController {
 	}
 
 	/**
-	 * @param tokenDto
-	 * @param messageId
+	 * @param fromDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
 	 * @Description 单条消息标记为已读
 	 * @Date 2020/3/29 21:05
 	 **/
 	@PostMapping("readmsg")
-	public Result readMessage(@LoginUser TokenDto tokenDto,
-							  @RequestParam("messageId") String messageId) {
+	public Result readMessage(@RequestBody ReadMessageFromDTO fromDTO) {
 		//逻辑待实现
-		return userMessageService.readMessage(messageId);
+		return userMessageService.readMessage(fromDTO.getMessageId());
 	}
 
 	/**