From b70d796a59d1c3da4d90b9ac445b8f5e56998c71 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 24 Oct 2023 16:15:43 +0800 Subject: [PATCH] =?UTF-8?q?update=3D=3D=3D>:=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/chatrecord/ChatRecordController.java | 9 ++------- .../applet/mapper/chatrecord/ChatRecordMapper.java | 12 ++++++------ .../service/chatRecord/IChatRecordService.java | 3 --- .../chatRecord/impl/ChatRecordServiceImpl.java | 8 -------- .../mapper/applet/chatrecord/ChatRecordMapper.xml | 2 +- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java index d2db5d2..6b80fdd 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java @@ -1,7 +1,6 @@ package com.xinelu.applet.controller.chatrecord; import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MarkReadDto; import com.xinelu.applet.dto.chatrecord.MessageSearchDto; import com.xinelu.applet.service.chatRecord.IChatRecordService; import com.xinelu.applet.vo.chatrecord.MessageCenterVo; @@ -13,6 +12,7 @@ import com.xinelu.common.core.domain.R; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.socket.WebSocketUtils; import com.xinelu.manage.domain.chatRecord.ChatRecord; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; import java.util.Objects; @@ -35,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile; * @author wanghao * @create 2023/9/26 0026 */ +@Api(tags = "消息控制器") @RestController @RequestMapping("/nurseApplet/chatRecord") public class ChatRecordController extends BaseController { @@ -100,12 +101,6 @@ public class ChatRecordController extends BaseController { return R.ok(chatRecordService.getMegVoList(messageDto)); } - @ApiOperation("标记为已读") - @GetMapping("/markRead") - public R markRead(MarkReadDto markReadDto) { - return chatRecordService.markRead(markReadDto) < 0 ? R.fail() : R.ok(); - } - @ApiOperation("删除消息") @GetMapping("/deleteMegs") public R deleteMegs(@RequestBody List ids) { diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java index 78f27e1..23412d5 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java @@ -25,7 +25,7 @@ public interface ChatRecordMapper { * @param id 图文咨询-聊天记录主键 * @return 图文咨询-聊天记录 */ - public ChatRecord selectChatRecordById(Long id); + ChatRecord selectChatRecordById(Long id); /** * 查询图文咨询-聊天记录列表 @@ -33,7 +33,7 @@ public interface ChatRecordMapper { * @param chatRecord 图文咨询-聊天记录 * @return 图文咨询-聊天记录集合 */ - public List selectChatRecordList(ChatRecord chatRecord); + List selectChatRecordList(ChatRecord chatRecord); /** * 新增图文咨询-聊天记录 @@ -41,7 +41,7 @@ public interface ChatRecordMapper { * @param chatRecord 图文咨询-聊天记录 * @return 结果 */ - public int insertChatRecord(ChatRecord chatRecord); + int insertChatRecord(ChatRecord chatRecord); /** * 修改图文咨询-聊天记录 @@ -49,7 +49,7 @@ public interface ChatRecordMapper { * @param chatRecord 图文咨询-聊天记录 * @return 结果 */ - public int updateChatRecord(ChatRecord chatRecord); + int updateChatRecord(ChatRecord chatRecord); /** * 删除图文咨询-聊天记录 @@ -57,7 +57,7 @@ public interface ChatRecordMapper { * @param id 图文咨询-聊天记录主键 * @return 结果 */ - public int deleteChatRecordById(Long id); + int deleteChatRecordById(Long id); /** * 批量删除图文咨询-聊天记录 @@ -65,7 +65,7 @@ public interface ChatRecordMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteChatRecordByIds(Long[] ids); + int deleteChatRecordByIds(Long[] ids); Integer updateReadStatus(MarkReadDto markReadDto); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java index cf71e89..c096174 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java @@ -1,7 +1,6 @@ package com.xinelu.applet.service.chatRecord; import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MarkReadDto; import com.xinelu.applet.dto.chatrecord.MessageSearchDto; import com.xinelu.applet.vo.chatrecord.MessageCenterVo; import com.xinelu.common.core.domain.AjaxResult; @@ -80,7 +79,5 @@ public interface IChatRecordService { List getMegVoList(MessageSearchDto messageDto); - Integer markRead(MarkReadDto markReadDto); - Integer deleteMegs(List ids); } 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 144ed10..e0e0b7a 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 @@ -1,7 +1,6 @@ package com.xinelu.applet.service.chatRecord.impl; import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MarkReadDto; import com.xinelu.applet.dto.chatrecord.MessageSearchDto; import com.xinelu.applet.mapper.chatrecord.ChatRecordMapper; import com.xinelu.applet.service.chatRecord.IChatRecordService; @@ -215,13 +214,6 @@ public class ChatRecordServiceImpl implements IChatRecordService { return messageCenterVos; } - @Override public Integer markRead(MarkReadDto markReadDto) { - if (StringUtils.isBlank(markReadDto.getBindingNo())) { - return -1; - } - return chatRecordMapper.updateReadStatus(markReadDto); - } - @Override public Integer deleteMegs(List ids) { return chatRecordMapper.deleteMegs(ids); } diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml index ec664d5..907fae8 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml @@ -302,7 +302,7 @@ update chat_record set del_flag = 1 - + id in #{id}