From 098d606ddd6e9eccf22fe8c5bb703234dbda9614 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 21 Jun 2021 09:35:52 +0800
Subject: [PATCH] 修改单聊聊天记录，聊天列表接口，当不传分页参数页码数时，数据不分页

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/controller/ChatRecordsController.java    |   11 +++++++++--
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/ChatRecordsService.java          |   16 ++++++++++++++++
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/impl/ChatRecordsServiceImpl.java |   22 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/controller/ChatRecordsController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/controller/ChatRecordsController.java
index 257d13c..86ce445 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/controller/ChatRecordsController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/controller/ChatRecordsController.java
@@ -44,10 +44,13 @@
 		//查询单聊人的信息
 		List<User> user = Arrays.asList(iUserClient.userInfoById(chatRecords.getSenderId()).getData(), iUserClient.userInfoById(chatRecords.getRecipientId()).getData());
 		//查询单聊记录信息
-		IPage<ChatRecords> chatRecordsIPage = chatRecordsService.selectChatRecordsPage(Condition.getPage(query), chatRecords);
+		if (null==query.getCurrent()){
+			map.put("chatRecordsIPage",chatRecordsService.selectChatlist(chatRecords));
+		}else {
+			map.put("chatRecordsIPage",chatRecordsService.selectChatRecordsPage(Condition.getPage(query), chatRecords));
+		}
 		//封装数据
 		map.put("user",user);
-		map.put("chatRecordsIPage",chatRecordsIPage);
 		//返回数据
 		return R.data(map);
 	}
@@ -64,6 +67,10 @@
 	public R getChatListPage(@Valid ChatRecords chatRecords, HttpServletResponse response, Query query){
 		//跨域设置
 		crossDomain(response);
+		if(null==query.getCurrent()){
+			//不分页
+			return R.data(chatRecordsService.getChatList( chatRecords));
+		}
 		//查询当前人员的聊天列表，并返回数据
 		return R.data(chatRecordsService.getChatListPage(Condition.getPage(query), chatRecords));
 	}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/ChatRecordsService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/ChatRecordsService.java
index 6a41e14..06f6b8c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/ChatRecordsService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/ChatRecordsService.java
@@ -5,6 +5,8 @@
 import org.springblade.jfpt.chatrecords.entity.ChatRecords;
 import org.springblade.jfpt.chatrecords.vo.ChatRecordsVo;
 
+import java.util.List;
+
 /**
  * @author zhongrj
  * 聊天消息接口层
@@ -26,4 +28,18 @@
 	 * @return
 	 */
 	IPage<ChatRecordsVo> getChatListPage(IPage<ChatRecordsVo> page, ChatRecords chatRecords);
+
+	/**
+	 * 查询当前用户的聊天列表(不分页)
+	 * @param chatRecords 消息记录对象
+	 * @return
+	 */
+	List<ChatRecordsVo> getChatList(ChatRecords chatRecords);
+
+	/**
+	 * 查询单聊消息记录 (不分页)
+	 * @param chatRecords 消息记录对象
+	 * @return
+	 */
+	List<ChatRecords> selectChatlist(ChatRecords chatRecords);
 }
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/impl/ChatRecordsServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/impl/ChatRecordsServiceImpl.java
index a1f4b9a..4899cdb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/impl/ChatRecordsServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/chatrecords/service/impl/ChatRecordsServiceImpl.java
@@ -8,6 +8,8 @@
 import org.springblade.jfpt.chatrecords.vo.ChatRecordsVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author zhongrj
  */
@@ -35,4 +37,24 @@
 	public IPage<ChatRecordsVo> getChatListPage(IPage<ChatRecordsVo> page, ChatRecords chatRecords) {
 		return page.setRecords(baseMapper.getChatListPage(page,chatRecords));
 	}
+
+	/**
+	 * 查询当前用户的聊天列表(不分页)
+	 * @param chatRecords 消息记录对象
+	 * @return
+	 */
+	@Override
+	public List<ChatRecordsVo> getChatList(ChatRecords chatRecords) {
+		return baseMapper.getChatListPage(null,chatRecords);
+	}
+
+	/**
+	 * 查询单聊消息记录 (不分页)
+	 * @param chatRecords 消息记录对象
+	 * @return
+	 */
+	@Override
+	public List<ChatRecords> selectChatlist(ChatRecords chatRecords) {
+		return baseMapper.selectChatRecordsPage(null,chatRecords);
+	}
 }

--
Gitblit v1.9.3