From ea1f535f2c56897551de3db23408d82a3f222a57 Mon Sep 17 00:00:00 2001 From: HaoWang <1477026787@qq.com> Date: Tue, 24 Oct 2023 16:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E8=AF=8A=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=9C=80=E5=90=8E=E4=B8=80=E6=9D=A1=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/common/core/dto/MessageTemplate.java | 5 +++++ .../chatRecord/impl/ChatRecordServiceImpl.java | 1 + .../consultationInfo/ConsultationInfoMapper.xml | 2 ++ .../vo/consultationInfo/ConsultationInfoVO.java | 11 +++++++++++ 4 files changed, 19 insertions(+) diff --git a/xinelu-common/src/main/java/com/xinelu/common/core/dto/MessageTemplate.java b/xinelu-common/src/main/java/com/xinelu/common/core/dto/MessageTemplate.java index f5a80de..2d2b08e 100644 --- a/xinelu-common/src/main/java/com/xinelu/common/core/dto/MessageTemplate.java +++ b/xinelu-common/src/main/java/com/xinelu/common/core/dto/MessageTemplate.java @@ -40,6 +40,11 @@ public class MessageTemplate { */ private String msgType; + /** + * 消息类型(文字/图片) + */ + private String messageType; + /** * 发送时间 * */ diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java index 9103f9c..f19da9d 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java @@ -80,6 +80,7 @@ public class ChatRecordServiceImpl implements IChatRecordService { msg.setFromKey(chatRecord.getSenderId().toString()); msg.setToKey(chatRecord.getRecipientId().toString()); msg.setMsgType(MessageContentType.CHAT.name()); + msg.setMessageType(chatRecord.getMessageType()); msg.setSendTime(chatRecord.getSendTime()); return WebSocketUtils.sendMessage(chatRecord.getRecipientId().toString(), msg); } diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/consultationInfo/ConsultationInfoMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/consultationInfo/ConsultationInfoMapper.xml index e7ac6a4..8d602b4 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/consultationInfo/ConsultationInfoMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/consultationInfo/ConsultationInfoMapper.xml @@ -69,6 +69,8 @@ ci.doctor_name, ci.problem_description, ci.create_time, + (SELECT content FROM chat_record cr WHERE cr.consultation_id = ci.id ORDER BY create_time DESC LIMIT 1) as content, + (SELECT message_type FROM chat_record cr WHERE cr.consultation_id = ci.id ORDER BY create_time DESC LIMIT 1) as messageType, (SELECT COUNT(cr.id) FROM chat_record cr WHERE cr.consultation_id = ci.id AND read_status = '0' and sender_id= ci.doctor_id diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/consultationInfo/ConsultationInfoVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/consultationInfo/ConsultationInfoVO.java index 48b753c..88d02aa 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/consultationInfo/ConsultationInfoVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/consultationInfo/ConsultationInfoVO.java @@ -118,6 +118,15 @@ public class ConsultationInfoVO extends BaseEntity implements Serializable { */ private String medicalRecord; + /** + * 最近一次内容 + */ + private String content; + /** + * 内容类型 + */ + private String messageType; + /** * 是否删除标识，0：否，1：是 */ @@ -152,6 +161,8 @@ public class ConsultationInfoVO extends BaseEntity implements Serializable { .append("medicalRecord", getMedicalRecord()) .append("delFlag", getDelFlag()) .append("messageCount", getMessageCount()) + .append("content", getContent()) + .append("messageType", getMessageType()) .toString(); } }