From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgDeviceReadStateMapper.java |   68 ++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgDeviceReadStateMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgDeviceReadStateMapper.java
index 17282fc..4ebadee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgDeviceReadStateMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgDeviceReadStateMapper.java
@@ -1,28 +1,42 @@
-package com.yeshi.fanli.dao.mybatis.msg;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
-
-public interface MsgDeviceReadStateMapper extends BaseMapper<MsgDeviceReadState> {
-
-	/**
-	 * 鏍规嵁璁惧锛岃澶囩被鍨嬶紝娑堟伅绫诲瀷鑾峰彇
-	 * 
-	 * @param device
-	 * @param platform
-	 * @param type
-	 * @return
-	 */
-	MsgDeviceReadState selectByDeviceAndPlatformAndType(@Param("device") String device, @Param("platform") int platform,
-			@Param("type") String type);
-	
-	/**
-	 * 璁剧疆鎵�鏈夋秷鎭凡璇�
-	 * @param device
-	 * @param platform
-	 */
-	void setAllMsgRead(@Param("device") String device, @Param("platform") int platform);
-
+package com.yeshi.fanli.dao.mybatis.msg;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
+
+public interface MsgDeviceReadStateMapper extends BaseMapper<MsgDeviceReadState> {
+
+	/**
+	 * 鏍规嵁璁惧锛岃澶囩被鍨嬶紝娑堟伅绫诲瀷鑾峰彇
+	 * 
+	 * @param device
+	 * @param platform
+	 * @param type
+	 * @return
+	 */
+	MsgDeviceReadState selectByDeviceAndPlatformAndType(@Param("device") String device, @Param("platform") int platform,
+			@Param("type") String type);
+	
+	MsgDeviceReadState selectByDeviceAndPlatformAndTypeForUpdate(@Param("device") String device, @Param("platform") int platform,
+			@Param("type") String type);
+
+	/**
+	 * 璁剧疆鎵�鏈夋秷鎭凡璇�
+	 * 
+	 * @param device
+	 * @param platform
+	 */
+	void setAllMsgRead(@Param("device") String device, @Param("platform") int platform);
+
+	/**
+	 * 鑾峰彇鎵�鏈夎澶囩殑娑堟伅鍒楄〃
+	 * 
+	 * @param device
+	 * @param platform
+	 * @return
+	 */
+	List<MsgDeviceReadState> listByDeviceAndPlatform(@Param("device") String device, @Param("platform") int platform);
 }
\ No newline at end of file

--
Gitblit v1.8.0