Yaxin
/
virtual-patient
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交:默认视频

Browse Source
dev_2.0.0
liu 1 year ago
parent 117c5b0b64
commit 7eadb12c2c
8 changed files with 25 additions and 78 deletions
Show Stats Download Patch File Download Diff File

7
virtual-patient-web/src/main/java/com/supervision/controller/AskController.java
Unescape Escape View File

@ -42,12 +42,5 @@ public class AskController {
}
@ApiOperation("获取本地视频的文件流")
@GetMapping("/downloadTalkVideo")
public void downloadTalkVideo(String fileResourceId, HttpServletResponse response) {
askService.downloadTalkVideo(fileResourceId, response);
response.setContentType("video/mp4");
}
}

3
virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkResultResVO.java
Unescape Escape View File

@ -29,9 +29,6 @@ public class TalkResultResVO {
@ApiModelProperty("type='2' 是否需要检查部位 0：否 1：是")
private Integer requireLocation;
@ApiModelProperty("视频预览URL,本地视频的形式需要")
private String videoUrl;
@ApiModelProperty("视频base64位编码")
private String videoBase64;

2
virtual-patient-web/src/main/java/com/supervision/service/AskService.java
Unescape Escape View File

@ -20,7 +20,5 @@ public interface AskService {
TalkResultResVO talkByVideo(TalkVideoReqVO talkReqVO) throws IOException;
void downloadTalkVideo(String fileResourceId, HttpServletResponse response);
}

68
virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java
Unescape Escape View File

@ -49,13 +49,6 @@ public class AskServiceImpl implements AskService {
@Value("${answer.defaultNoMatchId}")
private String defaultNoMatchId;
@Value("${answer.video.basePath}")
private String videoPath;
@Value("${video-url}")
private String videoUrl;
@Override
public String receiveVoiceFile(MultipartFile file) {
if (file.getSize() <= 0) {
@ -203,7 +196,7 @@ public class AskServiceImpl implements AskService {
}
@Override
public TalkResultResVO talkByVideo(TalkVideoReqVO talkReqVO) throws IOException {
public TalkResultResVO talkByVideo(TalkVideoReqVO talkReqVO) {
// 根据processId找到对应的病人
Process process = Optional.ofNullable(processService.getById(talkReqVO.getProcessId())).orElseThrow(() -> new BusinessException("未找到诊疗进程"));
// 调用rasa获取文字内容
@ -212,8 +205,7 @@ public class AskServiceImpl implements AskService {
TalkResultResVO talkResultResVO = new TalkResultResVO();
// 如果rasa没有识别出来,则返回默认值
if (StrUtil.isBlank(rasaResult)) {
talkResultResVO.setVideoUrl(videoUrl + defaultNoMatchId);
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(defaultNoMatchId,null));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(defaultNoMatchId));
saveQaRecord(talkReqVO.getProcessId(), "default", null, talkReqVO.getText(), null, "您好,我没有听懂您说什么");
}
@ -234,8 +226,7 @@ public class AskServiceImpl implements AskService {
AskTemplateQuestionLibrary library = askTemplateQuestionLibraryService.getById(rasaResult);
if (ObjectUtil.isEmpty(library)) {
log.info("{}:未从问题库中找到,回答未识别语句", rasaResult);
talkResultResVO.setVideoUrl(videoUrl + defaultNoMatchId);
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(defaultNoMatchId,null));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(defaultNoMatchId));
saveQaRecord(talkReqVO.getProcessId(), "default", null, talkReqVO.getText(), null, "您好,我没有听懂您说什么");
} else {
AskPatientAnswer askPatientAnswer = askPatientAnswerService.lambdaQuery().eq(AskPatientAnswer::getMedicalId, process.getMedicalRecId())
@ -246,16 +237,13 @@ public class AskServiceImpl implements AskService {
// 首先看看default里面是不是存在,如果存在,就从default里面去找
if (StrUtil.isNotEmpty(library.getDefaultAnswer()) && StrUtil.isNotBlank(library.getDefaultAnswerResourceId())) {
String resText = library.getDefaultAnswer();
talkResultResVO.setVideoUrl(videoUrl + library.getDefaultAnswerResourceId());
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(library.getDefaultAnswerResourceId(),null));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(library.getDefaultAnswerResourceId()));
// 保存记录
saveQaRecord(talkReqVO.getProcessId(), "default", library.getId(), talkReqVO.getText(), library, resText);
log.info("{}:找到了默认答案:{}", rasaResult, talkReqVO.getText());
} else {
log.info("{}:没有从默认答案中找到找到默认内容,回复未识别语句", rasaResult);
talkResultResVO.setVideoUrl(videoUrl + (StrUtil.isEmpty(library.getDefaultAnswerResourceId()) ? defaultNoMatchId
:library.getDefaultAnswerResourceId()));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(library.getDefaultAnswerResourceId(),defaultNoMatchId));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(library.getDefaultAnswerResourceId()));
saveQaRecord(talkReqVO.getProcessId(), "default", null, talkReqVO.getText(), library, "您好,我没有听懂您说什么");
}
} else {
@ -265,22 +253,19 @@ public class AskServiceImpl implements AskService {
String resText = library.getDefaultAnswer();
log.info("{}:病历配置的回答:{}:为空不为空不为空,但在获取的时候,答案为空,开始回复默认语句,默认语句内容:{}", rasaResult, askPatientAnswer.getId(), resText);
// 这里返回视频
talkResultResVO.setVideoUrl(videoUrl + library.getDefaultAnswerResourceId());
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(library.getDefaultAnswerResourceId(),defaultNoMatchId));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(library.getDefaultAnswerResourceId()));
// 保存记录
saveQaRecord(talkReqVO.getProcessId(), "default", library.getId(), talkReqVO.getText(), library, resText);
} else {
log.info("{}:病历配置的回答:{}:为空不为空,但在获取的时候,答案为空,但是获取默认语句也为空,那么回复未识别语句", rasaResult, askPatientAnswer.getId());
talkResultResVO.setVideoUrl(videoUrl + defaultNoMatchId);
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(defaultNoMatchId,null));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(defaultNoMatchId));
saveQaRecord(talkReqVO.getProcessId(), "default", null, talkReqVO.getText(), library, "您好,我没有听懂您说什么");
}
} else {
String resText = askPatientAnswer.getAnswer();
log.info("{}:找到了病历配置的回答语句:{},回答内容:{}", rasaResult, askPatientAnswer.getId(), resText);
talkResultResVO.setVideoUrl(videoUrl + askPatientAnswer.getAnswerResourceId());
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(askPatientAnswer.getAnswerResourceId(),defaultNoMatchId));
talkResultResVO.setVideoBase64(getAnswerVideoBase64OrDefault(askPatientAnswer.getAnswerResourceId()));
// 保存记录
saveQaRecord(talkReqVO.getProcessId(), "patient", askPatientAnswer.getId(), talkReqVO.getText(), library, resText);
}
@ -292,37 +277,28 @@ public class AskServiceImpl implements AskService {
return talkResultResVO;
}
@Override
public void downloadTalkVideo(String fileResourceId, HttpServletResponse response) {
/**
* 获取应答视频的base64位编码
*
* @param fileResourceId 应答id
* @return 应答视频base64位编码
*/
private String getAnswerVideoBase64OrDefault(String fileResourceId) {
if (StrUtil.isBlank(fileResourceId)) {
fileResourceId = defaultNoMatchId;
}
FileResource fileResource = fileResourceService.getById(fileResourceId);
if (ObjectUtil.isEmpty(fileResource)) {
throw new BusinessException("未找到回复视频");
log.info("未找到视频,走默认视频");
fileResource = fileResourceService.getById(defaultNoMatchId);
}
try (InputStream inputStream = MinioUtil.download(fileResource.getMinioId())) {
IoUtil.copy(inputStream, response.getOutputStream());
return Base64Encoder.encode(IoUtil.readBytes(inputStream));
} catch (Exception e) {
log.error("获取视频失败", e);
throw new BusinessException("未找到回复视频");
}
}
/**
* 获取应答视频的base64位编码
* @param answerId 应答id
* @param defaultValue 默认应答id
* @return 应答视频base64位编码
*/
private String getAnswerVideoBase64OrDefault(String answerId, String defaultValue) {
Props props = new Props(videoPath + File.separator + "index");
String fileName = "";
if (StrUtil.isNotEmpty(answerId) && StrUtil.isNotEmpty(props.getStr(answerId))){
fileName = props.getStr(answerId);
}else if (StrUtil.isNotEmpty(defaultValue)){
fileName = props.getStr(defaultValue);
}
if (StrUtil.isEmpty(fileName)){
return null;
}
return Base64Encoder.encode(FileUtil.readBytes(videoPath + File.separator + fileName));
}
}

5
virtual-patient-web/src/main/resources/application-dev.yml
Unescape Escape View File

@ -86,8 +86,3 @@ ws:
answer:
# 对于没有匹配上的缺省回答ID,关联的是vp_file_resource的ID
defaultNoMatchId: 1739173836351885313
video:
basePath: /data/vp/video #最后一级不需要加分割符
# 视频预览,NGINX的地址,https的地址
video-url: https://124.220.94.55:8025/virtual-patient/ask/downloadTalkVideo?fileResourceId=

6
virtual-patient-web/src/main/resources/application-local.yml
Unescape Escape View File

@ -86,8 +86,4 @@ ws:
nginx-port: 443
answer:
# 对于没有匹配上的缺省回答ID,关联的是vp_file_resource的ID
defaultNoMatchId: 1739173836351885313
video:
basePath: F:\supervision\doc\数字人视频\final_video\final_video
# 视频预览
video-url: http://192.168.10.138:8899/virtual-patient/ask/downloadTalkVideo?fileResourceId=
defaultNoMatchId: 1739173836351885313

6
virtual-patient-web/src/main/resources/application-prod.yml
Unescape Escape View File

@ -74,8 +74,4 @@ human:
talk-status: /talkStatus
answer:
# 对于没有匹配上的缺省回答ID,关联的是vp_file_resource的ID
defaultNoMatchId: 1739173836351885313
video:
basePath: /data/vp/video #最后一级不需要加分割符
# 视频预览,NGINX的地址,https的地址
video-url: https://124.220.94.55:8025/virtual-patient/ask/downloadTalkVideo?fileResourceId=
defaultNoMatchId: 1739173836351885313

6
virtual-patient-web/src/main/resources/application-test.yml
Unescape Escape View File

@ -78,8 +78,4 @@ ws:
nginx-port: 443
answer:
# 对于没有匹配上的缺省回答ID,关联的是vp_file_resource的ID
defaultNoMatchId: 1739173836351885313
video:
basePath: /data/vp/video #最后一级不需要加分割符
# 视频预览,NGINX的地址,https的地址
video-url: https://124.220.94.55:8025/virtual-patient/ask/downloadTalkVideo?fileResourceId=
defaultNoMatchId: 1739173836351885313
Write Preview
Loading…
Cancel
Save