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 3d9148d..64d8420 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 @@ -2,11 +2,11 @@ package com.xinelu.web.controller.applet; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageInfo; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MessageSearchDto; -import com.xinelu.applet.service.chatRecord.IChatRecordService; -import com.xinelu.applet.service.messagepush.MessagePushService; -import com.xinelu.applet.vo.chatrecord.MessageVo; +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.messagepush.MessagePushService; +import com.xinelu.manage.vo.chatrecord.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-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java index 7d023fc..bdeaf8b 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java @@ -2,7 +2,6 @@ package com.xinelu.web.controller.applet; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.service.messagepush.MessagePushService; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; @@ -14,7 +13,6 @@ import com.xinelu.familydoctor.applet.pojo.query.NearbyOrgQuery; import com.xinelu.familydoctor.applet.pojo.query.PackageQuery; import com.xinelu.familydoctor.applet.pojo.query.TeamListQuery; import com.xinelu.familydoctor.applet.pojo.vo.*; -import com.xinelu.framework.config.AsyncExecutorConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java index 535617d..89e43ff 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java @@ -3,10 +3,6 @@ package com.xinelu.web.controller.fd; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MessageSearchDto; -import com.xinelu.applet.service.chatRecord.IChatRecordService; -import com.xinelu.applet.vo.chatrecord.MessageVo; import com.xinelu.common.core.domain.R; import com.xinelu.familydoctor.applet.pojo.body.ApprovalBody; import com.xinelu.familydoctor.applet.pojo.body.SyncHospitalPersonInfoBody; @@ -17,7 +13,6 @@ import com.xinelu.familydoctor.applet.pojo.vo.ResidentSignApplyVo; import com.xinelu.familydoctor.applet.service.IResidentRescindApplyService; import com.xinelu.familydoctor.applet.service.IResidentServiceAppletService; import com.xinelu.familydoctor.applet.service.IResidentSignAppletService; -import com.xinelu.manage.domain.chatRecord.ChatRecord; import com.xinelu.manage.domain.hospitalinfo.HospitalInfo; import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; import com.xinelu.manage.service.hospitalinfo.IHospitalInfoService; @@ -28,13 +23,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; @Api(tags = "家医调用接口") @RestController diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/dto/FDMessageDto.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/dto/FDMessageDto.java index 5919e50..ac7326e 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/dto/FDMessageDto.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/dto/FDMessageDto.java @@ -1,6 +1,6 @@ package com.xinelu.familydoctor.applet.pojo.dto; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; +import com.xinelu.manage.dto.chatrecord.ChatRecordDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java index c71e69f..e08422a 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java @@ -1,7 +1,7 @@ package com.xinelu.familydoctor.applet.service.impl; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.service.messagepush.MessagePushService; +import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.StringUtils; diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java index 5ddcdb6..01a32aa 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java @@ -2,8 +2,7 @@ package com.xinelu.familydoctor.applet.service.impl; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.service.messagepush.MessagePushService; -import com.xinelu.common.core.domain.R; +import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.StringUtils; @@ -14,7 +13,6 @@ import com.xinelu.familydoctor.applet.mapper.ResidentServiceApplyMapper; import com.xinelu.familydoctor.applet.pojo.body.ApprovalBody; import com.xinelu.familydoctor.applet.pojo.body.MessagePushBody; import com.xinelu.familydoctor.applet.pojo.body.ResidentServiceApplyBody; -import com.xinelu.familydoctor.applet.pojo.dto.ResidentServiceFormApplyDto; import com.xinelu.familydoctor.applet.pojo.entity.PatientInfo; import com.xinelu.familydoctor.applet.pojo.entity.ResidentServiceApplyEntity; import com.xinelu.familydoctor.applet.pojo.query.ApplyQuery; diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java index b230a87..e0d3517 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java @@ -1,7 +1,7 @@ package com.xinelu.familydoctor.applet.service.impl; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.service.messagepush.MessagePushService; +import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.StringUtils; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java index 7f9531a..7967b53 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java @@ -1,7 +1,7 @@ package com.xinelu.applet.controller.appletscreeningrecord; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.service.messagepush.MessagePushService; +import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.common.annotation.RepeatSubmit; import com.xinelu.common.config.XinELuConfig; import com.xinelu.common.constant.ScreeningProjectConstants; @@ -20,7 +20,6 @@ import com.xinelu.manage.vo.screeningrecord.ScreeningRecordVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.io.File; -import java.util.Date; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; 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 80070d2..6b1468b 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,17 +1,14 @@ package com.xinelu.applet.controller.chatrecord; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MessageSearchDto; -import com.xinelu.applet.service.chatRecord.IChatRecordService; -import com.xinelu.applet.vo.chatrecord.MessageCenterVo; -import com.xinelu.applet.vo.chatrecord.MessageVo; -import com.xinelu.common.annotation.Log; +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.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; -import com.xinelu.common.enums.BusinessType; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.socket.WebSocketUtils; import com.xinelu.manage.domain.chatRecord.ChatRecord; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java index 7f72f20..aa306de 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/patientcenter/impl/PatientCenterServiceImpl.java @@ -6,7 +6,7 @@ import com.xinelu.applet.dto.patientcenter.PatientCenterCouponDTO; import com.xinelu.applet.mapper.nurseapplogin.NurseAppLoginMapper; import com.xinelu.applet.mapper.nursingstationgoods.NursingStationGoodsMapper; import com.xinelu.applet.mapper.patientcenter.PatientCenterMapper; -import com.xinelu.applet.service.messagepush.MessagePushService; +import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.applet.service.patientcenter.PatientCenterService; import com.xinelu.applet.vo.coupon.CouponVO; import com.xinelu.applet.vo.patientcenter.PatientCenterCouponVO; 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 7ef99ca..6bbe5ce 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 @@ -2,7 +2,7 @@ - + @@ -63,8 +63,8 @@ read_status - select from chat_record @@ -79,7 +79,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, @@ -372,7 +372,7 @@ where id = #{id} - + update chat_record diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java index 2012cba..e2d6dbb 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java @@ -1,5 +1,6 @@ package com.xinelu.manage.controller.screeningrecord; +import com.alibaba.fastjson2.JSONObject; import com.xinelu.common.annotation.RepeatSubmit; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.R; @@ -12,6 +13,7 @@ import com.xinelu.manage.domain.screeningrecord.ScreeningRecord; import com.xinelu.manage.dto.screeningrecord.ScreeningRecordDTO; import com.xinelu.manage.dto.screeningrecord.ScreeningRecordSaveDTO; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; +import com.xinelu.manage.service.messagepush.MessagePushService; import com.xinelu.manage.service.screeningrecord.IScreeningRecordService; import com.xinelu.manage.vo.screeningrecord.ScreeningRecordVo; import io.swagger.annotations.Api; @@ -45,6 +47,9 @@ public class ScreeningRecordController extends BaseController { @Resource private IHospitalPersonInfoService personInfoService; + @Resource + private MessagePushService messagePushService; + @GetMapping("/screeningList") @ApiOperation(value = "居民预约筛查列表") public TableDataInfo screeningList(ScreeningRecordDTO query) throws Exception { @@ -116,8 +121,12 @@ public class ScreeningRecordController extends BaseController { if (StringUtils.equals("1", screeningRecordVo.getScreeningStatus())) { return R.fail("该预约未登记，请先登记！"); } - int flag = screeningRecordService.update(body); - return flag < 0 ? R.fail() : R.ok(); + JSONObject result = screeningRecordService.update(body); + if(result != null && result.containsKey("openid")) { + messagePushService.fdApprovePush(result); + return R.ok(); + } + return R.fail(); } @PostMapping("/pushScreening") diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/ChatRecordDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java similarity index 98% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/ChatRecordDTO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java index f39a037..d155cb7 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/ChatRecordDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.chatrecord; +package com.xinelu.manage.dto.chatrecord; import com.xinelu.common.core.domain.BaseEntity; import com.xinelu.common.custominterface.Insert; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/MarkReadDto.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MarkReadDto.java similarity index 94% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/MarkReadDto.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MarkReadDto.java index 08a910e..d30c36e 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/MarkReadDto.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MarkReadDto.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.chatrecord; +package com.xinelu.manage.dto.chatrecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/MessageSearchDto.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MessageSearchDto.java similarity index 97% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/MessageSearchDto.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MessageSearchDto.java index c63a489..fcdf38c 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/chatrecord/MessageSearchDto.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MessageSearchDto.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.chatrecord; +package com.xinelu.manage.dto.chatrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDMessageExtentDto.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDMessageExtentDto.java similarity index 95% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDMessageExtentDto.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDMessageExtentDto.java index 52419dd..7f6be6e 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDMessageExtentDto.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDMessageExtentDto.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.messagepush; +package com.xinelu.manage.dto.messagepush; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDMessagePushDto.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDMessagePushDto.java similarity index 97% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDMessagePushDto.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDMessagePushDto.java index 8885af9..394f917 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDMessagePushDto.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDMessagePushDto.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.messagepush; +package com.xinelu.manage.dto.messagepush; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDWxMegDto.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDWxMegDto.java similarity index 91% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDWxMegDto.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDWxMegDto.java index 03672ca..315bf67 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/FDWxMegDto.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/FDWxMegDto.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.messagepush; +package com.xinelu.manage.dto.messagepush; import lombok.Data; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/TemplateData.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/TemplateData.java similarity index 85% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/TemplateData.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/TemplateData.java index 2a79de4..cdf428e 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/messagepush/TemplateData.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/messagepush/TemplateData.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.dto.messagepush; +package com.xinelu.manage.dto.messagepush; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/chatrecord/ChatRecordMapper.java similarity index 90% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/chatrecord/ChatRecordMapper.java index 68551d2..b390878 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/chatrecord/chatrecord/ChatRecordMapper.java @@ -1,10 +1,10 @@ -package com.xinelu.applet.mapper.chatrecord; +package com.xinelu.manage.mapper.chatrecord.chatrecord; -import com.xinelu.applet.dto.chatrecord.MarkReadDto; -import com.xinelu.applet.dto.chatrecord.MessageSearchDto; -import com.xinelu.applet.vo.chatrecord.MessageCenterVo; -import com.xinelu.applet.vo.chatrecord.MessageVo; 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 java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/IChatRecordService.java similarity index 91% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/IChatRecordService.java index 77fbc76..a6f2f08 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/IChatRecordService.java @@ -1,13 +1,13 @@ -package com.xinelu.applet.service.chatRecord; +package com.xinelu.manage.service.chatrecord.chatRecord; import com.github.pagehelper.PageInfo; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MessageSearchDto; -import com.xinelu.applet.vo.chatrecord.MessageCenterVo; -import com.xinelu.applet.vo.chatrecord.MessageVo; import com.xinelu.common.core.domain.AjaxResult; 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 java.io.IOException; import java.util.List; import org.springframework.web.multipart.MultipartFile; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/impl/ChatRecordServiceImpl.java similarity index 95% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/impl/ChatRecordServiceImpl.java index 83363db..4a9c2af 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/chatRecord/impl/ChatRecordServiceImpl.java @@ -1,17 +1,10 @@ -package com.xinelu.applet.service.chatRecord.impl; +package com.xinelu.manage.service.chatrecord.chatRecord.impl; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.chatrecord.MessageSearchDto; -import com.xinelu.applet.mapper.chatrecord.ChatRecordMapper; -import com.xinelu.applet.service.chatRecord.IChatRecordService; -import com.xinelu.applet.vo.chatrecord.MessageCenterVo; -import com.xinelu.applet.vo.chatrecord.MessageVo; import com.xinelu.common.config.XinELuConfig; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.core.domain.R; import com.xinelu.common.core.dto.MessageTemplate; import com.xinelu.common.enums.MessageContentType; import com.xinelu.common.exception.ServiceException; @@ -25,16 +18,25 @@ import com.xinelu.common.utils.http.HttpService; import com.xinelu.common.utils.spring.SpringUtils; import com.xinelu.common.utils.uuid.IdUtils; import com.xinelu.manage.domain.chatRecord.ChatRecord; -import java.io.IOException; -import java.time.ZoneId; -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Resource; - 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.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.patientinfo.PatientInfoVO; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/messagepush/Impl/MessagePushServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java similarity index 96% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/messagepush/Impl/MessagePushServiceImpl.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java index f235319..7c60604 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/messagepush/Impl/MessagePushServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java @@ -1,41 +1,49 @@ -package com.xinelu.applet.service.messagepush.Impl; +package com.xinelu.manage.service.messagepush.Impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.dto.chatrecord.ChatRecordDTO; -import com.xinelu.applet.dto.messagepush.FDMessagePushDto; -import com.xinelu.applet.dto.messagepush.FDWxMegDto; -import com.xinelu.applet.dto.messagepush.TemplateData; -import com.xinelu.applet.service.chatRecord.IChatRecordService; -import com.xinelu.applet.service.messagepush.MessagePushService; import com.xinelu.common.config.AppletChatConfig; import com.xinelu.common.config.AppletPageConfig; import com.xinelu.common.constant.Constants; import com.xinelu.common.entity.AppletAccessToken; import com.xinelu.common.entity.MessageValueEntity; -import com.xinelu.common.enums.*; +import com.xinelu.common.enums.AppletSubscriptionMessageEnum; +import com.xinelu.common.enums.CouponTypeEnum; +import com.xinelu.common.enums.MessageTemplateType; +import com.xinelu.common.enums.MessageTypePath; +import com.xinelu.common.enums.SettingsTypeEnum; +import com.xinelu.common.enums.SubscribeStatusEnum; import com.xinelu.common.utils.AppletChatUtil; import com.xinelu.common.utils.http.HttpUtils; import com.xinelu.common.utils.map.MapUtil; import com.xinelu.common.utils.uuid.IdUtils; import com.xinelu.manage.domain.subscribemessagerecord.SubscribeMessageRecord; import com.xinelu.manage.domain.systemsettingsinfo.SystemSettingsInfo; +import com.xinelu.manage.dto.chatrecord.ChatRecordDTO; +import com.xinelu.manage.dto.messagepush.FDMessagePushDto; +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.messagepush.MessagePushService; import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.vo.patientcouponreceive.PatientCouponReceiveInfoVO; import com.xinelu.manage.vo.patientinfo.PatientInfoVO; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.*; - /** * @Description 消息推送实现层 * @Author zh diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/messagepush/MessagePushService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/MessagePushService.java similarity index 93% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/messagepush/MessagePushService.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/MessagePushService.java index 05cdac0..db54b0b 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/messagepush/MessagePushService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/MessagePushService.java @@ -1,12 +1,9 @@ -package com.xinelu.applet.service.messagepush; - +package com.xinelu.manage.service.messagepush; import com.alibaba.fastjson2.JSONObject; -import com.xinelu.applet.dto.messagepush.FDMessagePushDto; import com.xinelu.common.entity.AppletAccessToken; import com.xinelu.manage.domain.subscribemessagerecord.SubscribeMessageRecord; import com.xinelu.manage.vo.patientcouponreceive.PatientCouponReceiveInfoVO; - import java.util.Map; /** diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java index d0eb893..dbd8c12 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java @@ -51,7 +51,7 @@ public interface IScreeningRecordService { * @return * @throws Exception */ - Integer update(ScreeningRecord body); + JSONObject update(ScreeningRecord body); /** * @Author mengkuiliang diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java index de76b4c..e4b5318 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java @@ -135,7 +135,6 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { int flag = screeningRecordMapper.insert(recordBody); if(flag > 0) { // 组装发送消息通知参数 - result.put("busType", "10"); result.put("openid", registerVo.getOpenid()); result.put("receiveName", registerVo.getPatientName()); result.put("text1", body.getHospitalName()); @@ -153,7 +152,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { } @Override - public Integer update(ScreeningRecord body) { + public JSONObject update(ScreeningRecord body) { HospitalPersonInfo hospitalPersonInfo = hospitalPersonInfoMapper.selectHospitalPersonInfoById(SecurityUtils.getLoginUser().getUser().getHospitalPersonId()); if (hospitalPersonInfo != null) { body.setDoctorId(hospitalPersonInfo.getId()); @@ -168,23 +167,27 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { body.setScreeningStatus("4"); body.setScreeningDate(new Date()); int flag = screeningRecordMapper.update(body); + // 校验是否已经注册 + PatientInfoVO registerVo = patientService.selectPatientInfoById(Long.getLong(body.getPatientId())); + JSONObject result = new JSONObject(); + result.put("patientId", body.getPatientId()); if (flag > 0) { // TODO 推送提醒 - //PatientInfoVO patientInfoVO = patientService.selectPatientInfoById(body.getPatientId()); - //JSONObject jsonObject = new JSONObject(); - //jsonObject.fluentPut("senderNo", SecurityUtils.getUserId()) - // .fluentPut("senderName", SecurityUtils.getLoginUser().getUser().getNickName()) - // .fluentPut("recipientName", patientInfoVO.getPatientName()) - // .fluentPut("recipientIdentity", patientInfoVO.getCardNo()) - // .fluentPut("messageType", "6") - // .fluentPut("messageCategory", "1") - // .fluentPut("templateType", MessageTypeEnum.JTYSXXTZ.getType()) - // .fluentPut("sendTime", DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")) - // .fluentPut("content", "您的筛查项目已检测完成，点击查看详情。") - // .fluentPut("contentId", body.getScreeningId()); - //FdmpPushMegUtil.sendPost(jsonObject); + // 组装发送消息通知参数 + result.put("openid", registerVo.getOpenid()); + result.put("receiveName", registerVo.getPatientName()); + result.put("text1", body.getHospitalName()); + result.put("text2", (body.getProjectName().length() >= 17? (body.getProjectName().substring(0, 17) + "..."): body.getProjectName())); + result.put("text3", body.getProjectName()); + result.put("sendTitle", "筛查预约"); + result.put("sendTime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date())); + result.put("busType", "10"); + result.put("sendContent", "您的筛查项目已检测完成，点击查看详情。"); + result.put("messageType", "6"); + result.put("messageCategory", "4"); + result.put("cardNo", registerVo.getCardNo()); } - return flag; + return result; } /** diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/chatrecord/MessageCenterVo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageCenterVo.java similarity index 96% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/chatrecord/MessageCenterVo.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageCenterVo.java index dda4074..bfcb3ab 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/chatrecord/MessageCenterVo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageCenterVo.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.vo.chatrecord; +package com.xinelu.manage.vo.chatrecord.chatrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/chatrecord/MessageVo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageVo.java similarity index 97% rename from xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/chatrecord/MessageVo.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageVo.java index a5a401e..0e25f0e 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/chatrecord/MessageVo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/chatrecord/chatrecord/MessageVo.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.vo.chatrecord; +package com.xinelu.manage.vo.chatrecord.chatrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel;