xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update===>:修改视频问诊。

Browse Source
This commit is contained in:
haown 2023-11-07 11:33:06 +08:00
parent 169038c60a
commit 35318d8ca8
15 changed files with 403 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xinelu-admin/src/main/resources/application.yml
View File

@ -258,8 +258,8 @@ fd:
trtc:
sdkappid: 1600006944
sdksecretkey: 6ddbc3e7e4aa128b52898df27a35f8f3d5acdca6f34ffa17b87ebc33e83314f1
secretid: AKIDjKo7GF2g9PQJ7KMBpGUTFrFZP7cw2upY
secretkey: c1HajkZCdrrhLsDRUL1XotpeUAkAOSM7
secretid: AKIDYxAAwVrPveKvQuO2zwojOxRpCTflkz9E
secretkey: 540sfPH5obKxVxwW4Xt8KTfmS4b2Nfu4
# 微信小程序参数配置信息
applet-chat-config:

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java
View File

@ -1,7 +1,7 @@
package com.xinelu.applet.controller.consultationInfo;
import com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.applet.service.consultationInfo.IConsultationInfoService;
import com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.manage.service.consultationInfo.IConsultationInfoService;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.AjaxResult;

46
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/videoconsultation/VideoConsultationController.java
View File

@ -1,11 +1,7 @@
package com.xinelu.applet.controller.videoconsultation;
import com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.applet.service.consultationInfo.IConsultationInfoService;
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.socket.WebSocketUtils;
import com.xinelu.common.utils.tencentcloudapi.common.Credential;
import com.xinelu.common.utils.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.xinelu.common.utils.tencentcloudapi.common.profile.ClientProfile;
@ -14,10 +10,9 @@ import com.xinelu.common.utils.tencentcloudapi.trtc.v20190722.TLSSigAPIv2;
import com.xinelu.common.utils.tencentcloudapi.trtc.v20190722.TrtcClient;
import com.xinelu.common.utils.tencentcloudapi.trtc.v20190722.models.DissolveRoomRequest;
import com.xinelu.common.utils.tencentcloudapi.trtc.v20190722.models.DissolveRoomResponse;
import com.xinelu.manage.service.consultationInfo.IConsultationInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Date;
import java.util.Random;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
@ -37,6 +32,8 @@ public class VideoConsultationController {
@Value("${trtc.sdkappid}")
private Long sdkappid;
@Value("${trtc.sdksecretkey}")
private String sdksecretkey;
@Value("${trtc.secretid}")
private String secretid;
@Value("${trtc.secretkey}")
@ -51,33 +48,15 @@ public class VideoConsultationController {
@ApiOperation("获取userSig")
@GetMapping("getUserSig/{userId}")
public R<String> getUserSig(@PathVariable String userId) {
TLSSigAPIv2 sigAPIv2 = new TLSSigAPIv2(sdkappid, secretkey);
TLSSigAPIv2 sigAPIv2 = new TLSSigAPIv2(sdkappid, sdksecretkey);
String userSig = sigAPIv2.genUserSig(userId, 36000);
return R.ok(userSig);
}
@ApiOperation("开始视频")
@GetMapping("start/{consultationInfoId}")
public R<String> start(@PathVariable Long consultationInfoId) {
// 房间号
Random random = new Random();
int randomNumber = random.nextInt(900000) + 100000; // 限制范围为 100000-999999
String roomId = String.valueOf(randomNumber);
if (roomId.length() < 6) {
roomId = "0" + roomId; // 补零
}
MessageTemplate msg = new MessageTemplate();
// 根据图文咨询申请主键查询居民主键
ConsultationInfoDTO consultationInfoDTO = consultationInfoService.selectConsultationInfoById(consultationInfoId);
if (consultationInfoDTO == null) {
return R.fail("生成房间号失败");
}
msg.setMessage(roomId);
msg.setToKey(String.valueOf(consultationInfoDTO.getPatientId()));
msg.setMsgType(MessageContentType.CONSULTATION.name());
msg.setSendTime(new Date());
WebSocketUtils.sendMessage(String.valueOf(consultationInfoDTO.getPatientId()), msg);
return R.ok(roomId);
@ApiOperation("开始视频--医生APP")
@GetMapping("start/{goodsOrderId}")
public AjaxResult start(@PathVariable Long goodsOrderId) {
return consultationInfoService.startConsultation(goodsOrderId);
}
@ -95,4 +74,11 @@ public class VideoConsultationController {
DissolveRoomResponse resp = client.DissolveRoom(req);
return R.ok(resp.getRequestId());
}
@ApiOperation("小程序通过订单号查询房间号")
@GetMapping("getRoomId/{goodsOrderId}")
public AjaxResult getAppletRoomId(@PathVariable Long goodsOrderId) {
return consultationInfoService.getAppletRoomId(goodsOrderId);
}
}

1
xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/consultationInfo/ConsultationInfo.java
View File

@ -159,7 +159,6 @@ public class ConsultationInfo extends BaseEntity implements Serializable {
*/
private Integer delFlag;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

6
xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/goodsOrder/GoodsOrder.java
View File

@ -185,6 +185,11 @@ public class GoodsOrder extends BaseDomain implements Serializable {
*/
private Long consultationInfoId;
/**
* 房间号--视频问诊用
*/
private String roomId;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@ -207,6 +212,7 @@ public class GoodsOrder extends BaseDomain implements Serializable {
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("roomId", getRoomId())
.toString();
}
}

5
xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java
View File

@ -84,6 +84,11 @@ public class ChatRecordDTO extends BaseEntity implements Serializable {
@Length(max = 400, message = "消息内容不能超过18位", groups = {Insert.class, Update.class})
private String content;
/**
* 消息内容业务主键，用于点击跳转
*/
private String contentId;
/**
* 标题
*/

2
xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/consultationInfo/ConsultationInfoDTO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.dto.consultationInfo;
package com.xinelu.manage.dto.consultationInfo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinelu.common.core.domain.BaseEntity;

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/consultationInfo/ConsultationInfoMapper.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/consultationInfo/ConsultationInfoMapper.java
View File

@ -1,6 +1,6 @@
package com.xinelu.applet.mapper.consultationInfo;
package com.xinelu.manage.mapper.consultationInfo;
import com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.manage.domain.consultationInfo.ConsultationInfo;
import com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO;
import org.apache.ibatis.annotations.Param;

11
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/IConsultationInfoService.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/consultationInfo/IConsultationInfoService.java
View File

@ -1,14 +1,13 @@
package com.xinelu.applet.service.consultationInfo;
package com.xinelu.manage.service.consultationInfo;
import com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.exception.file.InvalidExtensionException;
import com.xinelu.manage.domain.consultationInfo.ConsultationInfo;
import com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
import org.springframework.web.multipart.MultipartFile;
/**
@ -74,4 +73,8 @@ public interface IConsultationInfoService {
* @return 结果
*/
public AjaxResult uploadConsultationFile(MultipartFile multipartFile) throws IOException, InvalidExtensionException;
AjaxResult startConsultation(Long consultationInfoId);
AjaxResult getAppletRoomId(Long goodsOrderId);
}

90
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/consultationInfo/impl/ConsultationInfoServiceImpl.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/consultationInfo/impl/ConsultationInfoServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.xinelu.applet.service.consultationInfo.impl;
package com.xinelu.manage.service.consultationInfo.impl;
import com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.applet.mapper.consultationInfo.ConsultationInfoMapper;
import com.xinelu.applet.service.consultationInfo.IConsultationInfoService;
import com.alibaba.fastjson2.JSONObject;
import com.xinelu.common.config.XinELuConfig;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.exception.ServiceException;
@ -12,17 +10,26 @@ import com.xinelu.common.utils.bean.BeanUtils;
import com.xinelu.common.utils.file.FileUploadUtils;
import com.xinelu.common.utils.file.MimeTypeUtils;
import com.xinelu.manage.domain.consultationInfo.ConsultationInfo;
import com.xinelu.manage.domain.goodsOrder.GoodsOrder;
import com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.manage.mapper.consultationInfo.ConsultationInfoMapper;
import com.xinelu.manage.mapper.goodsOrder.GoodsOrderMapper;
import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
import com.xinelu.manage.service.consultationInfo.IConsultationInfoService;
import com.xinelu.manage.service.messagepush.MessagePushService;
import com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO;
import com.xinelu.manage.vo.patientinfo.PatientInfoVO;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Random;
import javax.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
/**
* 在线问诊-问诊信息（图文和视频问诊基本信息）Service业务层处理
@ -38,6 +45,15 @@ public class ConsultationInfoServiceImpl implements IConsultationInfoService {
@Resource
private XinELuConfig xinYiLuConfig;
@Resource
private GoodsOrderMapper goodsOrderMapper;
@Resource
private MessagePushService messagePushService;
@Resource
private PatientInfoMapper patientInfoMapper;
/**
* 查询在线问诊-问诊信息（图文和视频问诊基本信息）
*
@ -143,4 +159,62 @@ public class ConsultationInfoServiceImpl implements IConsultationInfoService {
ajax.put("fileUrl", pictureName);
return ajax;
}
@Override public AjaxResult startConsultation(Long goodsOrderId) {
GoodsOrder goodOrder = goodsOrderMapper.selectGoodsOrderById(goodsOrderId);
if (goodOrder == null) {
return AjaxResult.error("未查找到该订单，请联系管理员");
}
// 根据图文咨询申请主键查询居民主键
ConsultationInfoDTO consultationInfo = consultationInfoMapper.selectConsultationInfoById(goodOrder.getConsultationInfoId());
if (consultationInfo == null) {
return AjaxResult.error("生成房间号失败");
}
String roomId = "";
if(com.xinelu.common.utils.StringUtils.isNotBlank(goodOrder.getRoomId())) {
roomId = goodOrder.getRoomId();
} else {
// 房间号
Random random = new Random();
int randomNumber = random.nextInt(900000) + 100000; // 限制范围为 100000-999999
roomId = String.valueOf(randomNumber);
if (roomId.length() < 6) {
roomId = "0" + roomId; // 补零
}
// 保存房间号
goodOrder.setRoomId(roomId);
goodsOrderMapper.updateGoodsOrder(goodOrder);
}
PatientInfoVO patient = patientInfoMapper.selectPatientInfoById(goodOrder.getPatientId());
if (patient == null) {
return AjaxResult.error("未查询到该居民");
}
// 给居民推送消息通知
JSONObject result = new JSONObject()
.fluentPut("patientId", patient.getId())
.fluentPut("openid", patient.getOpenid())
.fluentPut("receiveName", patient.getPatientName())
.fluentPut("sendTitle", "专家视频问诊")
.fluentPut("sendTime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date()))
.fluentPut("busType", "")
.fluentPut("sendContent", "专家邀请您进行视频问诊，请及时接听")
.fluentPut("messageType", "1")
.fluentPut("messageCategory", "4")
.fluentPut("cardNo", patient.getCardNo())
.fluentPut("senderName", consultationInfo.getDoctorName())
.fluentPut("contentId", goodOrder.getId())
.fluentPut("sourceType", "1");
messagePushService.fdApprovePush(result);
return AjaxResult.success(roomId);
}
@Override
public AjaxResult getAppletRoomId(Long goodsOrderId) {
GoodsOrder order = goodsOrderMapper.selectGoodsOrderById(goodsOrderId);
if (order == null) {
return AjaxResult.error("未查询到订单信息");
}
return AjaxResult.success(order.getRoomId());
}
}

13
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java
View File

@ -297,6 +297,9 @@ public class MessagePushServiceImpl implements MessagePushService {
messageValueEntityMap.put("thing1", new MessageValueEntity(body.getString("senderName")));
messageValueEntityMap.put("time2", new MessageValueEntity(body.getString("sendTime")));
messageValueEntityMap.put("thing3", new MessageValueEntity(body.getString("sendContent")));
if (body.containsKey("contentId")) {
chatRecord.setContentId(body.getString("contentId"));
}
chatRecord.setContent(body.getString("sendContent"));
chatRecord.setRecipientName(body.getString("receiveName"));
chatRecord.setSenderName(body.getString("senderName"));
@ -306,7 +309,17 @@ public class MessagePushServiceImpl implements MessagePushService {
Map<String, Object> paramsMap = new HashMap<>();
paramsMap.put("touser", body.getString("openid"));
paramsMap.put("template_id", MessageTemplateType.getFolllowupTypeByCode(body.getString("busType")).getTemplateId());
if (StringUtils.isNotBlank(body.getString("sourceType"))) {
switch (body.getString("sourceType")) {
case "1": // 1：订单页面
paramsMap.put("page", appletPageConfig.getAppointOrderPageUrl());
break;
default:
paramsMap.put("page", appletPageConfig.getIntegralPageUrl());
break;
}
}
paramsMap.put("data", messageValueEntityMap);
//发送
this.sendPosts(appletAccessToken, paramsMap);

1
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java
View File

@ -172,7 +172,6 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService {
JSONObject result = new JSONObject();
result.put("patientId", body.getPatientId());
if (flag > 0) {
// TODO 推送提醒
// 组装发送消息通知参数
result.put("openid", registerVo.getOpenid());
result.put("receiveName", registerVo.getPatientName());

6
xinelu-nurse-applet/src/main/resources/mapper/applet/consultationInfo/ConsultationInfoMapper.xml → xinelu-nurse-manage/src/main/resources/mapper/manage/consultationInfo/ConsultationInfoMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xinelu.applet.mapper.consultationInfo.ConsultationInfoMapper">
<mapper namespace="com.xinelu.manage.mapper.consultationInfo.ConsultationInfoMapper">
<resultMap type="ConsultationInfo" id="ConsultationInfoResult">
<result property="id" column="id"/>
@ -57,7 +57,7 @@
from consultation_info
</sql>
<select id="selectConsultationInfoList" parameterType="com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO" resultType="com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO">
<select id="selectConsultationInfoList" parameterType="com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO" resultType="com.xinelu.manage.vo.consultationInfo.ConsultationInfoVO">
SELECT
ci.id,
ci.patient_id,
@ -113,7 +113,7 @@
ORDER BY ci.create_time DESC
</select>
<select id="selectConsultationInfoById" parameterType="Long" resultType="com.xinelu.applet.dto.consultationInfo.ConsultationInfoDTO">
<select id="selectConsultationInfoById" parameterType="Long" resultType="com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO">
select id,
patient_id,
patient_name,

11
xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
View File

@ -35,6 +35,7 @@
<result property="healthAppointDate" column="health_appoint_date"/>
<result property="hospitalPersonName" column="hospital_person_name"/>
<result property="consultationInfoId" column="consultation_info_id"/>
<result property="roomId" column="room_id"/>
</resultMap>
<!--商品订单信息及评价-->
@ -119,7 +120,8 @@
health_consultation_content,
health_appoint_date,
hospital_person_name,
consultation_info_id
consultation_info_id,
room_id
from goods_order
</sql>
@ -277,6 +279,8 @@
</if>
<if test="consultationInfoId != null">consultation_info_id,
</if>
<if test="roomId != null">room_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nurseStationId != null">#{nurseStationId},
@ -337,6 +341,8 @@
</if>
<if test="consultationInfoId != null">#{consultationInfoId},
</if>
<if test="roomId != null">#{roomId},
</if>
</trim>
</insert>
@ -430,6 +436,9 @@
<if test="consultationInfoId != null">consultation_info_id =
#{consultationInfoId},
</if>
<if test="roomId != null">room_id =
#{roomId},
</if>
</trim>
where id = #{id}
</update>