From 9619439cd84dfe42016e43f6867bbfba8e24a286 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 2 Nov 2023 11:45:12 +0800 Subject: [PATCH] =?UTF-8?q?update=3D=3D=3D>:=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B7=AF=E5=BE=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/applet/FdMessageController.java | 4 ++-- .../controller/chatrecord/ChatRecordController.java | 4 ++-- .../{chatrecord => }/ChatRecordMapper.java | 6 +++--- .../{chatRecord => }/IChatRecordService.java | 6 +++--- .../{chatRecord => }/impl/ChatRecordServiceImpl.java | 10 +++++----- .../messagepush/Impl/MessagePushServiceImpl.java | 2 +- .../chatrecord/{chatrecord => }/MessageCenterVo.java | 2 +- .../vo/chatrecord/{chatrecord => }/MessageVo.java | 2 +- .../mapper/manage}/chatrecord/ChatRecordMapper.xml | 12 ++++++------ 9 files changed, 24 insertions(+), 24 deletions(-) rename xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/{chatrecord => }/ChatRecordMapper.java (94%) rename xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/{chatRecord => }/IChatRecordService.java (94%) rename xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/{chatRecord => }/impl/ChatRecordServiceImpl.java (97%) rename xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/{chatrecord => }/MessageCenterVo.java (96%) rename xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/{chatrecord => }/MessageVo.java (97%) rename {xinelu-nurse-applet/src/main/resources/mapper/applet => xinelu-nurse-manage/src/main/resources/mapper/manage}/chatrecord/ChatRecordMapper.xml (98%) diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/FdMessageController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/FdMessageController.java index 64d8420..11085cc 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/FdMessageController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/FdMessageController.java @@ -4,9 +4,9 @@ import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageInfo; import com.xinelu.manage.dto.chatrecord.ChatRecordDTO; import com.xinelu.manage.dto.chatrecord.MessageSearchDto; -import com.xinelu.manage.service.chatrecord.chatRecord.IChatRecordService; +import com.xinelu.manage.service.chatrecord.IChatRecordService; import com.xinelu.manage.service.messagepush.MessagePushService; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageVo; +import com.xinelu.manage.vo.chatrecord.MessageVo; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.R; import com.xinelu.common.exception.ServiceException; 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 6b1468b..9fc7d4d 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 @@ -2,8 +2,8 @@ package com.xinelu.applet.controller.chatrecord; import com.xinelu.manage.dto.chatrecord.ChatRecordDTO; import com.xinelu.manage.dto.chatrecord.MessageSearchDto; -import com.xinelu.manage.service.chatrecord.chatRecord.IChatRecordService; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageCenterVo; +import com.xinelu.manage.service.chatrecord.IChatRecordService; +import com.xinelu.manage.vo.chatrecord.MessageCenterVo; import com.xinelu.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/chatrecord/ChatRecordMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/ChatRecordMapper.java similarity index 94% rename from xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/chatrecord/ChatRecordMapper.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/ChatRecordMapper.java index b390878..605215e 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/chatrecord/ChatRecordMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/ChatRecordMapper.java @@ -1,10 +1,10 @@ -package com.xinelu.manage.mapper.chatrecord.chatrecord; +package com.xinelu.manage.mapper.chatrecord; import com.xinelu.manage.domain.chatRecord.ChatRecord; import com.xinelu.manage.dto.chatrecord.MarkReadDto; import com.xinelu.manage.dto.chatrecord.MessageSearchDto; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageCenterVo; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageVo; +import com.xinelu.manage.vo.chatrecord.MessageCenterVo; +import com.xinelu.manage.vo.chatrecord.MessageVo; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/IChatRecordService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/IChatRecordService.java similarity index 94% rename from xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/IChatRecordService.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/IChatRecordService.java index a6f2f08..03d3cb9 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/IChatRecordService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/IChatRecordService.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.service.chatrecord.chatRecord; +package com.xinelu.manage.service.chatrecord; import com.github.pagehelper.PageInfo; import com.xinelu.common.core.domain.AjaxResult; @@ -6,8 +6,8 @@ import com.xinelu.common.exception.file.InvalidExtensionException; import com.xinelu.manage.domain.chatRecord.ChatRecord; import com.xinelu.manage.dto.chatrecord.ChatRecordDTO; import com.xinelu.manage.dto.chatrecord.MessageSearchDto; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageCenterVo; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageVo; +import com.xinelu.manage.vo.chatrecord.MessageCenterVo; +import com.xinelu.manage.vo.chatrecord.MessageVo; import java.io.IOException; import java.util.List; import org.springframework.web.multipart.MultipartFile; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/impl/ChatRecordServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/impl/ChatRecordServiceImpl.java similarity index 97% rename from xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/impl/ChatRecordServiceImpl.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/impl/ChatRecordServiceImpl.java index 4a9c2af..bc81fe7 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/impl/ChatRecordServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/impl/ChatRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.service.chatrecord.chatRecord.impl; +package com.xinelu.manage.service.chatrecord.impl; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; @@ -21,12 +21,12 @@ import com.xinelu.manage.domain.chatRecord.ChatRecord; import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; import com.xinelu.manage.dto.chatrecord.ChatRecordDTO; import com.xinelu.manage.dto.chatrecord.MessageSearchDto; -import com.xinelu.manage.mapper.chatrecord.chatrecord.ChatRecordMapper; -import com.xinelu.manage.service.chatrecord.chatRecord.IChatRecordService; +import com.xinelu.manage.mapper.chatrecord.ChatRecordMapper; +import com.xinelu.manage.service.chatrecord.IChatRecordService; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.service.patientinfo.IPatientInfoService; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageCenterVo; -import com.xinelu.manage.vo.chatrecord.chatrecord.MessageVo; +import com.xinelu.manage.vo.chatrecord.MessageCenterVo; +import com.xinelu.manage.vo.chatrecord.MessageVo; import com.xinelu.manage.vo.patientinfo.PatientInfoVO; import java.io.IOException; import java.util.ArrayList; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java index 7c60604..d2f42a0 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java @@ -25,7 +25,7 @@ import com.xinelu.manage.dto.messagepush.FDWxMegDto; import com.xinelu.manage.dto.messagepush.TemplateData; import com.xinelu.manage.mapper.subscribemessagerecord.SubscribeMessageRecordMapper; import com.xinelu.manage.mapper.systemsettingsinfo.SystemSettingsInfoMapper; -import com.xinelu.manage.service.chatrecord.chatRecord.IChatRecordService; +import com.xinelu.manage.service.chatrecord.IChatRecordService; import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.vo.patientcouponreceive.PatientCouponReceiveInfoVO; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageCenterVo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/MessageCenterVo.java similarity index 96% rename from xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageCenterVo.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/MessageCenterVo.java index bfcb3ab..c63fb58 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageCenterVo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/MessageCenterVo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.vo.chatrecord.chatrecord; +package com.xinelu.manage.vo.chatrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageVo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/MessageVo.java similarity index 97% rename from xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageVo.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/MessageVo.java index 0e25f0e..dd37302 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageVo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/MessageVo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.vo.chatrecord.chatrecord; +package com.xinelu.manage.vo.chatrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/chatrecord/ChatRecordMapper.xml similarity index 98% rename from xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml rename to xinelu-nurse-manage/src/main/resources/mapper/manage/chatrecord/ChatRecordMapper.xml index 6bbe5ce..3930ecd 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/chatrecord/ChatRecordMapper.xml @@ -2,7 +2,7 @@ - + @@ -64,7 +64,7 @@ - select from chat_record where del_flag = '0' and message_category = #{messageCategory} @@ -115,7 +115,7 @@ - where del_flag = '0' and sender_id = #{senderId} @@ -183,7 +183,7 @@ - select cr.id, cr.message_no, cr.message_category,