From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java
index 55c9192..e8b0f91 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.service.inter.msg;
 
+import java.util.Date;
+
 import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
 
 /**
@@ -29,15 +31,17 @@
 	 */
 	public void setDeviceMsgRead(String type, String device, int platform);
 
+
 	/**
 	 * 娣诲姞璁惧鏈娑堟伅
-	 * 
 	 * @param type
 	 * @param device
 	 * @param platform
 	 * @param msgCount
+	 * @param msg
+	 * @param msgTime -娑堟伅鍙戠敓鏃堕棿
 	 */
-	public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount);
+	public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount, String msg,Date msgTime);
 
 	/**
 	 * 璁剧疆鎵�鏈夋秷鎭凡璇�
@@ -55,4 +59,22 @@
 	 */
 	public void initReadState(String device, int platform, String type);
 
+	/**
+	 * 鑾峰彇璁惧鏈娑堟伅鏁伴噺
+	 * 
+	 * @param device
+	 * @param platform
+	 * @return
+	 */
+	public int getUnReadCount(String device, int platform);
+
+	/**
+	 * 鑾峰彇璁惧鏈娑堟伅鏁伴噺(鏍规嵁绫诲瀷)
+	 * @param device
+	 * @param platform
+	 * @param type
+	 * @return
+	 */
+	public int getUnReadCount(String device, int platform, String type);
+
 }

--
Gitblit v1.8.0