From 3893fb34d6b7a4034620b3ec63833b253c442bf6 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 28 Nov 2024 16:32:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=AF=9D?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../police/mapper/ConversationMapper.java | 3 ++-
.../police/service/ConversationService.java | 3 ++-
.../police/service/impl/ChatServiceImpl.java | 4 ++--
.../service/impl/ConversationServiceImpl.java | 6 ++++--
src/main/resources/mapper/ConversationMapper.xml | 13 ++++++++++++-
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/supervision/police/mapper/ConversationMapper.java b/src/main/java/com/supervision/police/mapper/ConversationMapper.java
index 074e2d9..02f7adf 100644
--- a/src/main/java/com/supervision/police/mapper/ConversationMapper.java
+++ b/src/main/java/com/supervision/police/mapper/ConversationMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.supervision.police.domain.Conversation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.supervision.police.vo.ConversationResVo;
+import java.util.Date;
/**
* @author yaxin
@@ -14,7 +15,7 @@ import com.supervision.police.vo.ConversationResVo;
*/
public interface ConversationMapper extends BaseMapper<Conversation> {
- IPage<ConversationResVo> queryUserConversationList(String userId, Page<ConversationResVo> page);
+ IPage<ConversationResVo> queryUserConversationList(String userId, Date startTime,Date endTime, Page<ConversationResVo> page);
}
diff --git a/src/main/java/com/supervision/police/service/ConversationService.java b/src/main/java/com/supervision/police/service/ConversationService.java
index 73cdade..1cdd241 100644
--- a/src/main/java/com/supervision/police/service/ConversationService.java
+++ b/src/main/java/com/supervision/police/service/ConversationService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.supervision.police.domain.Conversation;
import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.police.vo.ConversationResVo;
+import java.util.Date;
/**
* @author yaxin
@@ -13,6 +14,6 @@ import com.supervision.police.vo.ConversationResVo;
*/
public interface ConversationService extends IService<Conversation> {
- IPage<ConversationResVo> queryUserConversationList(String userId, Page<ConversationResVo> objectPage);
+ IPage<ConversationResVo> queryUserConversationList(String userId, Date startTime, Date endTime, Page<ConversationResVo> page);
}
diff --git a/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java
index a70ac13..11b41d9 100644
--- a/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java
@@ -1,6 +1,7 @@
package com.supervision.police.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
@@ -18,7 +19,6 @@ import com.supervision.police.domain.ModelIndex;
import com.supervision.police.dto.AnalyseCaseDTO;
import com.supervision.police.dto.IndexDetail;
import com.supervision.police.dto.IndexResultQuery;
-import com.supervision.police.dto.caseScore.CaseScoreDetailDTO;
import com.supervision.police.service.*;
import com.supervision.police.vo.ChatReqVO;
import com.supervision.police.vo.ChatResVO;
@@ -210,7 +210,7 @@ public class ChatServiceImpl implements ChatService {
public IPage<ConversationResVo> queryUserConversationList(String userId, int page, int size) {
Assert.notEmpty(userId, "用户id不能为空");
- return conversationService.queryUserConversationList(userId, new Page<>(page,size));
+ return conversationService.queryUserConversationList(userId, DateUtil.offsetDay(DateUtil.date(), -180),null, new Page<>(page,size));
}
@Override
diff --git a/src/main/java/com/supervision/police/service/impl/ConversationServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ConversationServiceImpl.java
index 4e3fbdc..6fd77f7 100644
--- a/src/main/java/com/supervision/police/service/impl/ConversationServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ConversationServiceImpl.java
@@ -9,6 +9,8 @@ import com.supervision.police.mapper.ConversationMapper;
import com.supervision.police.vo.ConversationResVo;
import org.springframework.stereotype.Service;
+import java.util.Date;
+
/**
* @author yaxin
* @description 针对表【conversation(会话记录表)】的数据库操作Service实现
@@ -19,8 +21,8 @@ public class ConversationServiceImpl extends ServiceImpl<ConversationMapper, Con
implements ConversationService{
@Override
- public IPage<ConversationResVo> queryUserConversationList(String userId, Page<ConversationResVo> page) {
- return super.getBaseMapper().queryUserConversationList(userId, page);
+ public IPage<ConversationResVo> queryUserConversationList(String userId, Date startTime,Date endTime, Page<ConversationResVo> page) {
+ return super.getBaseMapper().queryUserConversationList(userId,startTime,endTime, page);
}
}
diff --git a/src/main/resources/mapper/ConversationMapper.xml b/src/main/resources/mapper/ConversationMapper.xml
index 75d53ec..0b29012 100644
--- a/src/main/resources/mapper/ConversationMapper.xml
+++ b/src/main/resources/mapper/ConversationMapper.xml
@@ -28,6 +28,17 @@
from conversation c
left join model_case mc on c.case_id = mc.id
left join case_person cp on (c.case_id = cp.case_id and cp.case_actor_flag = 1 and cp.role_code = '1')
- where c.user_id = #{userId} order by c.create_time desc
+ <where>
+ <if test="userId != null and userId != ''">
+ and c.user_id = #{userId}
+ </if>
+ <if test="startTime != null">
+ and c.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ <![CDATA[and c.create_time <= #{endTime}]]>
+ </if>
+ </where>
+ order by c.create_time desc
</select>
</mapper>