diff --git a/pom.xml b/pom.xml
index 7bca64a..5b4fd1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,13 @@
spring-boot-starter-freemarker
+
+ org.apache.tika
+ tika-core
+ 1.24.1
+
+
+
diff --git a/src/main/java/com/supervision/controller/RobotTalkController.java b/src/main/java/com/supervision/controller/RobotTalkController.java
index 84cf035..cfee8e6 100644
--- a/src/main/java/com/supervision/controller/RobotTalkController.java
+++ b/src/main/java/com/supervision/controller/RobotTalkController.java
@@ -2,8 +2,10 @@ package com.supervision.controller;
import com.supervision.dto.robot.RobotTalkDTO;
+import com.supervision.dto.robot.SuspectInfo;
import com.supervision.service.RobotTalkService;
import com.supervision.vo.robot.ArchivesReqVo;
+import com.supervision.vo.robot.CommonDialogVo;
import com.supervision.vo.talk.RobotTalkReq;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -44,7 +46,7 @@ public class RobotTalkController {
@ApiOperation("获取对话内容列表")
@GetMapping("/talkList")
- public List talkList(String sessionId) {
+ public List talkList(String sessionId) {
return robotTalkService.talkList(sessionId);
}
@@ -55,12 +57,12 @@ public class RobotTalkController {
robotTalkService.getAudio(response,audioId);
}
- @ApiOperation("下载嫌疑人归档数据")
+ /* @ApiOperation("下载嫌疑人归档数据")
@GetMapping("/downLoadArchives")
public void downLoadArchives(HttpServletResponse response,
ArchivesReqVo archivesReq) throws IOException {
robotTalkService.downLoadArchives(response,archivesReq);
- }
+ }*/
@ApiOperation("下载对话过程中的文件")
@@ -70,4 +72,11 @@ public class RobotTalkController {
String imageId) throws IOException {
robotTalkService.downLoadFile(response,fileType,imageId);
}
+
+
+ @ApiOperation("查询嫌疑人信息")
+ @GetMapping("/querySuspectInfo")
+ public List querySuspectInfo(String sessionId, String name) {
+ return robotTalkService.querySuspectInfo(sessionId,name);
+ }
}
diff --git a/src/main/java/com/supervision/controller/SessionController.java b/src/main/java/com/supervision/controller/SessionController.java
index f32e894..5d9418c 100644
--- a/src/main/java/com/supervision/controller/SessionController.java
+++ b/src/main/java/com/supervision/controller/SessionController.java
@@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
import java.util.List;
@Slf4j
diff --git a/src/main/java/com/supervision/domain/IrFile.java b/src/main/java/com/supervision/domain/IrFile.java
index eadb068..21f50f3 100644
--- a/src/main/java/com/supervision/domain/IrFile.java
+++ b/src/main/java/com/supervision/domain/IrFile.java
@@ -30,7 +30,7 @@ public class IrFile implements Serializable {
private byte[] fileByte;
/**
- * 文件类型
+ * 文件类型 1: base64 2:原生(未经过base64编码)
*/
private String fileType;
diff --git a/src/main/java/com/supervision/domain/IrKnowledge.java b/src/main/java/com/supervision/domain/IrKnowledge.java
index 28f6f24..5377ab9 100644
--- a/src/main/java/com/supervision/domain/IrKnowledge.java
+++ b/src/main/java/com/supervision/domain/IrKnowledge.java
@@ -45,7 +45,7 @@ public class IrKnowledge implements Serializable {
private String resultTemplate;
/**
- * 查询结果数据类型：1：Map 2:List> 3: bytea
+ * 查询结果数据类型：1：Map 2:List> 3: bytea 4：档案文件
*/
private Integer resultType;
diff --git a/src/main/java/com/supervision/domain/IrSessionHistory.java b/src/main/java/com/supervision/domain/IrSessionHistory.java
index a22f0dc..72acaeb 100644
--- a/src/main/java/com/supervision/domain/IrSessionHistory.java
+++ b/src/main/java/com/supervision/domain/IrSessionHistory.java
@@ -42,7 +42,7 @@ public class IrSessionHistory implements Serializable {
private String answer;
/**
- * 回答类型 1:文字 2：语音 3：文件
+ * 回答类型 1:文字 2：语音 3：文件 6-确认弹框
*/
private Integer answerType;
diff --git a/src/main/java/com/supervision/dto/QueryProcessDTO.java b/src/main/java/com/supervision/dto/QueryProcessDTO.java
index 578e3fb..62be806 100644
--- a/src/main/java/com/supervision/dto/QueryProcessDTO.java
+++ b/src/main/java/com/supervision/dto/QueryProcessDTO.java
@@ -5,7 +5,9 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import java.io.File;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
@Data
@@ -18,7 +20,7 @@ public class QueryProcessDTO {
private Integer state;
/**
- * 内容类型 1-文本，2-音频，3-文件，4-图片，5-视频
+ * 内容类型 1-文本，2-音频，3-文件，4-图片，5-视频 6-档案文件
*/
private Integer contentType;
@@ -32,6 +34,8 @@ public class QueryProcessDTO {
*/
private byte[] byteContent;
+ private File fileContent;
+
/**
* 字节数组类型的id
*/
diff --git a/src/main/java/com/supervision/dto/robot/AnswerInfo.java b/src/main/java/com/supervision/dto/robot/AnswerInfo.java
index 3a17a5e..503ee6e 100644
--- a/src/main/java/com/supervision/dto/robot/AnswerInfo.java
+++ b/src/main/java/com/supervision/dto/robot/AnswerInfo.java
@@ -3,13 +3,15 @@ package com.supervision.dto.robot;
import lombok.Builder;
import lombok.Data;
+import java.io.File;
+
@Data
@Builder
public class AnswerInfo {
/**
- * 问题回答类型：1-文本，2-音频，3-文件，4-图片，5-视频
+ * 问题回答类型：1-文本，2-音频，3-文件，4-图片，5-视频 6-确认弹框 7-档案文件
*/
private Integer contentType;
@@ -37,13 +39,15 @@ public class AnswerInfo {
/**
* 回答文件id
*/
- private String answerByteId;
+ private String byteId;
/**
* 回答文件字节数组
*/
private transient byte[] answerByte;
+ private transient File answerFile;
+
/**
* 嫌疑人信息列表
diff --git a/src/main/java/com/supervision/service/RobotTalkService.java b/src/main/java/com/supervision/service/RobotTalkService.java
index bff2eb8..f8419b1 100644
--- a/src/main/java/com/supervision/service/RobotTalkService.java
+++ b/src/main/java/com/supervision/service/RobotTalkService.java
@@ -1,7 +1,9 @@
package com.supervision.service;
import com.supervision.dto.robot.RobotTalkDTO;
+import com.supervision.dto.robot.SuspectInfo;
import com.supervision.vo.robot.ArchivesReqVo;
+import com.supervision.vo.robot.CommonDialogVo;
import com.supervision.vo.talk.RobotTalkReq;
import org.springframework.web.multipart.MultipartFile;
@@ -23,7 +25,7 @@ public interface RobotTalkService {
* @return
*/
- List talkList(String sessionId);
+ List talkList(String sessionId);
void getAudio(HttpServletResponse response, String audioId) throws IOException;
@@ -37,4 +39,8 @@ public interface RobotTalkService {
void downLoadFile(HttpServletResponse response, String fileType, String imageId) throws IOException;
+
+
+
+ List querySuspectInfo(String sessionId,String name);
}
diff --git a/src/main/java/com/supervision/service/TalkService.java b/src/main/java/com/supervision/service/TalkService.java
deleted file mode 100644
index b908e2d..0000000
--- a/src/main/java/com/supervision/service/TalkService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.supervision.service;
-
-/**
- * 对话服务
- *
- */
-public interface TalkService {
-
- /**
- * 回答问题
- * @param questionId 问题id
- * @return 回答内容
- */
- String answer(String questionId);
-}
diff --git a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
index 0c7b63a..b6297b0 100644
--- a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
+++ b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
@@ -32,6 +32,7 @@ import com.supervision.domain.IrSessionHistory;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
/**
@@ -103,17 +104,10 @@ public class IrSessionServiceImpl extends ServiceImpl> maps = null;
try {
- maps = rowSqlMapper.selectList(knowledge.getSqlTemplate(), getParams(paramsList, sessionParams));
+ if (Integer.valueOf(4).equals(knowledge.getResultType())){
+ Map params = getParams(paramsList, sessionParams);
+ // todo：测试使用
+ String path = localArchivesFilePath(rootPath, MapUtil.getStr(params, "ajid"),
+ MapUtil.getStr(params, "khrzjhm"),MapUtil.getStr(params, "khrmc"));
+
+ File tempFile = FileUtil.createTempFile();
+ generateZip(tempFile, FileUtil.loopFiles(path), true);
+ Map stringHashMap = new HashMap<>();
+ stringHashMap.put("fileContent", tempFile);
+ maps = CollUtil.toList(stringHashMap);
+ }else {
+ maps = rowSqlMapper.selectList(knowledge.getSqlTemplate(), getParams(paramsList, sessionParams));
+ }
} catch (Exception e) {
log.error("执行查询sql失败", e);
queryProcessDTO.setState(2);
@@ -90,6 +116,13 @@ public class QueryTemplateProcessorImpl implements QueryTemplateProcessor {
return queryProcessDTO;
}
+ public void generateZip(File targetZipFile, List sourceFiles, boolean dirWithFlag) {
+ if (CollUtil.isNotEmpty(sourceFiles)) {
+ File[] fileArr = sourceFiles.toArray(new File[]{});
+ ZipUtil.zip(targetZipFile, dirWithFlag, fileArr);
+ }
+ }
+
private void wrapperSqlResult(IrKnowledge knowledge, List> maps, QueryProcessDTO queryProcessDTO) {
if (Integer.valueOf(1).equals(knowledge.getResultType())) {
@@ -119,6 +152,12 @@ public class QueryTemplateProcessorImpl implements QueryTemplateProcessor {
queryProcessDTO.setContentType(3);
queryProcessDTO.setByteContentId(CollUtil.getFirst(maps).get("byteContentId").toString());
}
+
+ if (Integer.valueOf(4).equals(knowledge.getResultType())){
+ queryProcessDTO.setStringContent(knowledge.getResultTemplate());
+ queryProcessDTO.setFileContent((File) CollUtil.getFirst(maps).get("fileContent"));
+ queryProcessDTO.setContentType(6);
+ }
// 去除回响应字符串中的特殊字符
if (StrUtil.isNotEmpty(queryProcessDTO.getStringContent())){
queryProcessDTO.setStringContent(StrUtil.cleanBlank(queryProcessDTO.getStringContent()));
@@ -137,4 +176,19 @@ public class QueryTemplateProcessorImpl implements QueryTemplateProcessor {
}
+ private String localArchivesFilePath(String rootPath,String caseId,
+ String idNumber,String name) {
+ String path = StrUtil.join(File.separator,caseId,
+ StrUtil.join("-",name,idNumber));
+ if (StrUtil.isNotEmpty(rootPath)){
+ path = StrUtil.join(File.separator, rootPath, path);
+ }
+ // 判断文件是否存在
+ if (FileUtil.exist(path)){
+ return path;
+ }
+ return null;
+ }
+
+
}
diff --git a/src/main/java/com/supervision/service/impl/RobotTalkServiceImpl.java b/src/main/java/com/supervision/service/impl/RobotTalkServiceImpl.java
index 72c4ee0..72a9bfe 100644
--- a/src/main/java/com/supervision/service/impl/RobotTalkServiceImpl.java
+++ b/src/main/java/com/supervision/service/impl/RobotTalkServiceImpl.java
@@ -19,6 +19,7 @@ import com.supervision.mapper.RobotDataMapper;
import com.supervision.service.*;
import com.supervision.util.UserUtil;
import com.supervision.vo.robot.ArchivesReqVo;
+import com.supervision.vo.robot.CommonDialogVo;
import com.supervision.vo.talk.RobotTalkReq;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -33,9 +34,7 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -66,11 +65,10 @@ public class RobotTalkServiceImpl implements RobotTalkService {
@Transactional(rollbackFor = Exception.class)
public RobotTalkDTO textTalk2Robot(RobotTalkReq robotTalkReq) {
String sessionId = robotTalkReq.getSessionId();
- String message = robotTalkReq.getMessage();
Assert.notEmpty(sessionId, "sessionId不能为空");
TimeInterval timeInterval = new TimeInterval();
timeInterval.start("all");
- log.info("textTalk2Robot:开始问答,sessionId:{},message:{}",sessionId,message);
+ log.info("textTalk2Robot:开始问答,参数:{}",JSONUtil.toJsonStr(robotTalkReq));
RobotTalkDTO robotTalkDTO = RobotTalkDTO.builder()
.sessionId(sessionId).doNext(true)
@@ -78,19 +76,28 @@ public class RobotTalkServiceImpl implements RobotTalkService {
.answerInfo(AnswerInfo.builder().contentType(robotTalkReq.getAnswerType()).build())
.build();
- // todo：识别下载文件的语义
+ // 确认弹框信息
+ if (StrUtil.isNotEmpty(robotTalkReq.getAskId())){
+ IrSessionHistory sessionHistory = sessionService.lambdaQuery().eq(IrSessionHistory::getId, robotTalkReq.getAskId()).one();
+ if (Objects.nonNull(sessionHistory)){
+ robotTalkReq.setMessage(sessionHistory.getUserQuestion());
+ robotTalkReq.setConfirmFlag(true);
+ robotTalkDTO.getAskInfo().setAskId(robotTalkReq.getAskId());
+ }
+ }
// 提取信息中的关键信息
if (Boolean.FALSE.equals(robotTalkReq.isConfirmFlag())){
- extractInformation(sessionId, message, robotTalkDTO);
+ extractInformation(sessionId, robotTalkReq.getMessage(), robotTalkDTO);
}
// 匹配问题意图
- MatchQuestionAnswerDTO matchQuestionAnswerDTO = matchQuestionAnswer(message);
+ MatchQuestionAnswerDTO matchQuestionAnswerDTO = robotTalkDTO.isDoNext() ? matchQuestionAnswer(robotTalkReq.getMessage()) : null;
+
// 获取机器人配置
IrRobotConfig config = irRobotConfigService.lambdaQuery().one();
if (Objects.isNull(matchQuestionAnswerDTO) && robotTalkDTO.isDoNext()){
// 未匹配到查询意图,设置默认错误语
- log.info("问题:{}未匹配到意图",message);
+ log.info("问题:{}未匹配到意图",robotTalkReq.getMessage());
robotTalkDTO.getAnswerInfo().setMessage(config.getErrorLanguage());
robotTalkDTO.setDoNext(false);
}
@@ -101,14 +108,16 @@ public class RobotTalkServiceImpl implements RobotTalkService {
Integer.valueOf(3).equals(matchAnswer.getContentType())){
// 查询结果类型为字节数组
robotTalkDTO.getAnswerInfo().setContentType(3);
- robotTalkDTO.getAnswerInfo().setAnswerByteId(matchAnswer.getByteContentId());
+ robotTalkDTO.getAnswerInfo().setByteId(matchAnswer.getByteContentId());
robotTalkDTO.getAnswerInfo().setAnswerByte(matchAnswer.getByteContent());
- }else {
+ }else{
+ robotTalkDTO.getAnswerInfo().setAnswerFile(matchAnswer.getFileContent());
robotTalkDTO.getAnswerInfo().setMessage(decideAnswer(matchAnswer, config));
}
}
logSessionInfo(robotTalkDTO, matchQuestionAnswerDTO);
+ robotTalkDTO.getAnswerInfo().setVoiceBase64(null);
log.info("textTalk2Robot:结束问答,耗时:{}ms",timeInterval.interval("all"));
return robotTalkDTO;
@@ -117,8 +126,7 @@ public class RobotTalkServiceImpl implements RobotTalkService {
private void logSessionInfo(RobotTalkDTO robotTalkDTO, MatchQuestionAnswerDTO matchQuestionAnswerDTO) {
// 组装日志信息
IrSessionHistory irSessionHistory = talk2SessionHistory(robotTalkDTO.getSessionId(),
- robotTalkDTO.getAnswerInfo().getMessage(), matchQuestionAnswerDTO);
- irSessionHistory.setAnswerType(robotTalkDTO.getAnswerInfo().getContentType());
+ robotTalkDTO, matchQuestionAnswerDTO);
// 保存回答音频文件
IrVoice irVoice = saveAudioIfNoAbsent(robotTalkDTO.getAnswerInfo().getMessage());
@@ -129,16 +137,17 @@ public class RobotTalkServiceImpl implements RobotTalkService {
irSessionHistory.setAnswerVoiceId(irVoice.getId());
}
- if (Objects.nonNull(robotTalkDTO.getAnswerInfo().getAnswerByte())) {
+ if (Objects.nonNull(robotTalkDTO.getAnswerInfo().getAnswerByte())
+ || Objects.nonNull(robotTalkDTO.getAnswerInfo().getAnswerFile())) {
// 如果返回的结果是字节，保存到文件表
- IrFile irFile = saveFileIfNoAbsent(robotTalkDTO.getAnswerInfo().getAnswerByte());
+ IrFile irFile = saveFileIfNoAbsent(robotTalkDTO.getAnswerInfo());
if (Objects.nonNull(irFile)) {
robotTalkDTO.getAnswerInfo().setContentType(3);
- robotTalkDTO.getAnswerInfo().setAnswerByteId(irFile.getId());
+ robotTalkDTO.getAnswerInfo().setByteId(irFile.getId());
}
}
// 写入对话日志
- sessionService.save(irSessionHistory);
+ sessionService.saveOrUpdate(irSessionHistory);
robotTalkDTO.getAskInfo().setAskId(irSessionHistory.getId());
}
@@ -173,6 +182,7 @@ public class RobotTalkServiceImpl implements RobotTalkService {
if (Objects.nonNull(suspectInfo)){
sessionParams.add(new IrSessionParam(sessionId,"jykh",StrUtil.join(",",suspectInfo.getCardNumber())));
sessionParams.add(new IrSessionParam(sessionId,"khrzjhm",suspectInfo.getIdNumber()));
+ sessionParams.add(new IrSessionParam(sessionId,"khrmc",suspectInfo.getName()));
}
IrSessionParam sessionParam = irSessionParamService.lambdaQuery().eq(IrSessionParam::getSessionId, sessionId)
@@ -220,17 +230,32 @@ public class RobotTalkServiceImpl implements RobotTalkService {
extractInformationDTO.getCardNumber());
answerInfo.setContentType(6);
- answerInfo.setSuspectInfo(CollUtil.getFirst(suspectInfos));
+ SuspectInfo suspectInfo = Objects.isNull(CollUtil.getFirst(suspectInfos)) ?
+ extractInformation2Suspect(extractInformationDTO) : CollUtil.getFirst(suspectInfos);
+ answerInfo.setSuspectInfo(suspectInfo);
robotTalkDTO.setDoNext(false);
}
}
+ private SuspectInfo extractInformation2Suspect(ExtractInformationDTO informationDTO) {
+
+ SuspectInfo suspectInfo = new SuspectInfo();
+ suspectInfo.setName(informationDTO.getName());
+ suspectInfo.setIdNumber(informationDTO.getIdNumber());
+ if (StrUtil.isNotEmpty(informationDTO.getCardNumber())){
+ suspectInfo.setCardNumber(CollUtil.newArrayList(informationDTO.getCardNumber()));
+ }
+ return suspectInfo;
+ }
+
private static String decideAnswer(QueryProcessDTO process, IrRobotConfig config) {
// 正确查询出结果
- if (Integer.valueOf(0).equals(process.getState())
- && Integer.valueOf(1).equals(process.getContentType())){
- // 查询结果类型为字符串
+ if (Integer.valueOf(0).equals(process.getState())){
+ if (Integer.valueOf(1).equals(process.getContentType()) ||
+ Integer.valueOf(6).equals(process.getContentType())){
+ // 查询结果类型为字符串
return process.getStringContent();
+ }
}
// 参数异常或查询结果异常
if (Integer.valueOf(1).equals(process.getState())
@@ -240,25 +265,36 @@ public class RobotTalkServiceImpl implements RobotTalkService {
return null;
}
- private IrFile saveFileIfNoAbsent(byte[] byteContent) {
- if (Objects.isNull(byteContent)){
+ private IrFile saveFileIfNoAbsent(AnswerInfo answerInfo) {
+ if (Objects.isNull(answerInfo.getAnswerByte()) && Objects.isNull(answerInfo.getAnswerFile())){
return null;
}
+ String fileType = Integer.valueOf(3).equals(answerInfo.getContentType()) ? "1" : "2";
IrFile irFile = new IrFile();
- irFile.setFileByte(byteContent);
- irFile.setFileSize(byteContent.length);
+ irFile.setFileType(fileType);
irFile.setFileName("answer");
- irFile.setFileType("F");
+ if ("1".equals(irFile.getFileType())){
+ irFile.setFileByte(answerInfo.getAnswerByte());
+ }else {
+ irFile.setFileByte(IoUtil.readBytes(FileUtil.getInputStream(answerInfo.getAnswerFile())));
+ FileUtil.del(answerInfo.getAnswerFile());
+ }
+ irFile.setFileSize(irFile.getFileByte().length);
+ irFile.setFileType(fileType);
irFileService.save(irFile);
return irFile;
}
- private IrSessionHistory talk2SessionHistory(String sessionId, String message,
+ private IrSessionHistory talk2SessionHistory(String sessionId, RobotTalkDTO robotTalkDTO,
MatchQuestionAnswerDTO matchQuestionAnswerDTO) {
IrSessionHistory sessionHistory = new IrSessionHistory();
+ sessionHistory.setId(robotTalkDTO.getAskInfo().getAskId());
sessionHistory.setSessionId(sessionId);
- sessionHistory.setUserQuestion(message);
+ AnswerInfo answerInfo = robotTalkDTO.getAnswerInfo();
+ sessionHistory.setAnswer(answerInfo.getMessage());
+ sessionHistory.setAnswerType(answerInfo.getContentType());
+ sessionHistory.setUserQuestion(answerInfo.getMessage());
sessionHistory.setCreateUserId(UserUtil.getUser().getId());
if (Objects.nonNull(matchQuestionAnswerDTO)){
sessionHistory.setMatchKnowledgeId(matchQuestionAnswerDTO.getMatchQuestionCode());
@@ -282,36 +318,53 @@ public class RobotTalkServiceImpl implements RobotTalkService {
} catch (IOException e) {
log.error("语音转文字失败", e);
}
+ // todo: 设置问题语音长度和 历史记录中的语音id
RobotTalkDTO robotTalkDTO = this.textTalk2Robot(robotTalkReq);
robotTalkDTO.getAskInfo().setContentType(2);
return robotTalkDTO;
}
@Override
- public List talkList(String sessionId) {
+ public List talkList(String sessionId) {
Assert.notEmpty(sessionId, "sessionId不能为空");
- List sessionHistoryList = sessionService.lambdaQuery().eq(IrSessionHistory::getSessionId, sessionId).list();
- return sessionHistoryList.stream().map(this::sessionHistory2RobotTalkDTO).collect(Collectors.toList());
+ List sessionHistoryList = sessionService.lambdaQuery().eq(IrSessionHistory::getSessionId, sessionId).orderBy(true, false,IrSessionHistory::getCreateTime).list();
+
+ // 获取音频的长度
+ List voiceIds = sessionHistoryList.stream()
+ .map(session -> CollUtil.toList(session.getAnswerVoiceId(), session.getUserQuestionVoiceId()))
+ .flatMap(Collection::stream).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
+
+ Map voiceLengthMap = CollUtil.isEmpty(voiceIds) ? new HashMap<>() :
+ irVoiceService.listByIds(voiceIds).stream().collect(Collectors.toMap(IrVoice::getId, IrVoice::getLength));
+
+
+ return sessionHistoryList.stream().map(session->this.sessionHistory2RobotTalkDTO(session,voiceLengthMap))
+ .filter(Objects::nonNull).flatMap(Collection::stream).collect(Collectors.toList());
}
- private RobotTalkDTO sessionHistory2RobotTalkDTO(IrSessionHistory sessionHistory) {
+ private List sessionHistory2RobotTalkDTO(IrSessionHistory sessionHistory,Map voiceLengthMap) {
if (Objects.isNull(sessionHistory)){
return null;
}
- AskInfo askInfo = AskInfo.builder()
- .askId(sessionHistory.getId())
- .message(sessionHistory.getUserQuestion())
- .contentType(sessionHistory.getAnswerType())
- //.audioLength(sessionHistory)
- .build();
- AnswerInfo answerInfo = AnswerInfo.builder()
- .contentType(sessionHistory.getAnswerType())
- .answerByteId(sessionHistory.getAnswerVoiceId())
- .message(sessionHistory.getAnswer())
+ CommonDialogVo askDiaLog = CommonDialogVo.builder().dialogType(1)
+ .dialogId(sessionHistory.getId()).sessionId(sessionHistory.getSessionId())
+ .contentType(StrUtil.isEmpty(sessionHistory.getUserQuestionVoiceId()) ? 1 : 2)//userQuestionVoiceId 为空，则为1 否则为2
+ .message(sessionHistory.getUserQuestion()).voiceBaseId(sessionHistory.getUserQuestionVoiceId())
+ .audioLength(voiceLengthMap.get(sessionHistory.getUserQuestionVoiceId())).build();
+
+ if (Integer.valueOf(6).equals(sessionHistory.getAnswerType())){
+ return CollUtil.newArrayList(askDiaLog);
+ }
+
+ CommonDialogVo answerDiaLog = CommonDialogVo.builder().dialogType(2)
+ .dialogId(sessionHistory.getId()).sessionId(sessionHistory.getSessionId())
+ .contentType(sessionHistory.getAnswerType()).message(sessionHistory.getAnswer())
+ .byteId(sessionHistory.getAnswerFileId()).voiceBaseId(sessionHistory.getAnswerVoiceId())
+ .audioLength(voiceLengthMap.get(sessionHistory.getAnswerVoiceId()))
.build();
- return RobotTalkDTO.builder().sessionId(sessionHistory.getSessionId())
- .askInfo(askInfo).answerInfo(answerInfo).build();
+
+ return CollUtil.toList(askDiaLog,answerDiaLog);
}
@Override
@@ -340,12 +393,33 @@ public class RobotTalkServiceImpl implements RobotTalkService {
if (Objects.isNull(file) || Objects.isNull(file.getFileByte())){
return;
}
- IoUtil.write(response.getOutputStream(), true, Base64.decode(file.getFileByte()));
+
+ if ("1".equals(file.getFileType())){
+ IoUtil.write(response.getOutputStream(), true, Base64.decode(file.getFileByte()));
+ }
+
+ if ("2".equals(file.getFileType())){
+ IoUtil.write(response.getOutputStream(), true,file.getFileByte());
+ }
+
+ }
+
+ @Override
+ public List querySuspectInfo(String sessionId, String name) {
+
+ Assert.notEmpty(sessionId, "sessionId不能为空");
+ //Assert.notEmpty(name, "name不能为空");
+
+ IrSessionParam sessionParam = irSessionParamService.lambdaQuery().eq(IrSessionParam::getSessionId, sessionId).eq(IrSessionParam::getParamName, "ajid").one();
+ Assert.notNull(sessionParam, "未查询到案件");
+ Assert.notEmpty(sessionParam.getParamValue(), "ajid不能为空");
+ return robotDataMapper.querySuspect(NumberUtil.parseInt(sessionParam.getParamValue()), null, name, null);
}
private String localArchivesFilePath(ArchivesReqVo archivesReq) {
String path = StrUtil.join(File.separator,archivesReq.getCaseId(),
- StrUtil.join("-",archivesReq.getName(),archivesReq.getIdNumber()));
+ StrUtil.join("-",archivesReq.getName(),archivesReq.getIdNumber()),
+ archivesReq.getDocumentId());
// 判断文件是否存在
if (FileUtil.exist(path)){
diff --git a/src/main/java/com/supervision/vo/robot/ArchivesReqVo.java b/src/main/java/com/supervision/vo/robot/ArchivesReqVo.java
index c5bb529..c533fec 100644
--- a/src/main/java/com/supervision/vo/robot/ArchivesReqVo.java
+++ b/src/main/java/com/supervision/vo/robot/ArchivesReqVo.java
@@ -10,4 +10,16 @@ public class ArchivesReqVo {
private String idNumber;
private String name;
+
+ private String documentId;
+
+ public ArchivesReqVo() {
+ }
+
+ public ArchivesReqVo(String caseId, String idNumber, String name, String documentId) {
+ this.caseId = caseId;
+ this.idNumber = idNumber;
+ this.name = name;
+ this.documentId = documentId;
+ }
}
diff --git a/src/main/java/com/supervision/vo/robot/CommonDialogVo.java b/src/main/java/com/supervision/vo/robot/CommonDialogVo.java
new file mode 100644
index 0000000..48379ff
--- /dev/null
+++ b/src/main/java/com/supervision/vo/robot/CommonDialogVo.java
@@ -0,0 +1,54 @@
+package com.supervision.vo.robot;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class CommonDialogVo {
+
+ /**
+ * 对话id
+ */
+ private String dialogId;
+
+
+ /**
+ * 会话id
+ */
+ private String sessionId;
+
+ /**
+ * 对话类型 1：问题 2：回答
+ */
+ private Integer dialogType;
+
+
+ /**
+ * 问题回答类型：1-文本，2-音频，3-文件，4-图片，5-视频
+ */
+ private Integer contentType;
+
+ /**
+ * 回答内容
+ */
+ private String message;
+
+ /**
+ * 语音长度
+ */
+ private Integer audioLength;
+
+ /**
+ * 回答音频id
+ */
+ private String voiceBaseId;
+
+
+
+ /**
+ * 回答文件id
+ */
+ private String byteId;
+
+}
diff --git a/src/main/java/com/supervision/vo/session/FinishSessionVO.java b/src/main/java/com/supervision/vo/session/FinishSessionVO.java
index 4bd31b5..6c0ee0b 100644
--- a/src/main/java/com/supervision/vo/session/FinishSessionVO.java
+++ b/src/main/java/com/supervision/vo/session/FinishSessionVO.java
@@ -14,14 +14,14 @@ public class FinishSessionVO {
@ApiModelProperty("会话评分(1满意 2不满意,3未评估)")
private Integer sessionScore;
- @ApiModelProperty("答非所问historyId")
- private List irrelevantAnswerHistoryId;
-
- @ApiModelProperty("信息错误historyId")
- private List errorAnswerHistoryId;
-
- @ApiModelProperty("其他historyId")
- private List otherAnswerHistoryId;
+ /**
+ * 原因 1信息错误 2答非所问 3其他
+ */
+ @ApiModelProperty("原因 1信息错误 2答非所问 3其他")
+ private Integer reasonType;
+
+ @ApiModelProperty("选中的问题id")
+ private List answerHistoryIdList;
}
diff --git a/src/main/java/com/supervision/vo/talk/RobotTalkReq.java b/src/main/java/com/supervision/vo/talk/RobotTalkReq.java
index 3a54adf..2a41752 100644
--- a/src/main/java/com/supervision/vo/talk/RobotTalkReq.java
+++ b/src/main/java/com/supervision/vo/talk/RobotTalkReq.java
@@ -9,6 +9,11 @@ public class RobotTalkReq {
private String sessionId;
+ /**
+ * 问题id
+ */
+ private String askId;
+
private String message;
/**
diff --git a/src/test/java/com/supervision/AskApplicationTests.java b/src/test/java/com/supervision/AskApplicationTests.java
index b8d77ef..00cd29d 100644
--- a/src/test/java/com/supervision/AskApplicationTests.java
+++ b/src/test/java/com/supervision/AskApplicationTests.java
@@ -1,6 +1,8 @@
package com.supervision;
import cn.hutool.core.codec.Base64;
+import cn.hutool.core.io.FileTypeUtil;
+import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import com.supervision.domain.IrFile;
import com.supervision.dto.QueryProcessDTO;
@@ -16,17 +18,24 @@ import freemarker.template.Template;
import freemarker.template.TemplateException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.BodyContentHandler;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.StringWriter;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import java.io.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,9 +50,9 @@ class AskApplicationTests {
private IrKnowledgeService irKnowledgeService;
-
@Autowired
private RowSqlMapper sqlMapper;
+
@Test
void rowSqlMapperTest() {
@@ -52,7 +61,7 @@ class AskApplicationTests {
//params.put("dept_name","沈阳公安");
// and dept_name= #{dept_name}
List> maps = sqlMapper.selectList("",params);
+ " and dept_name= #{dept_name} ", params);
System.out.println(maps);
}
@@ -65,7 +74,7 @@ class AskApplicationTests {
Template temp = databaseFreemarkerConfiguration.getTemplate("1770984442920292354");
StringWriter writer = new StringWriter();
HashMap params = new HashMap<>();
- params.put("jykh_count","ss");
+ params.put("jykh_count", "ss");
temp.process(params, writer);
System.out.println(writer);
writer.close();
@@ -105,16 +114,18 @@ class AskApplicationTests {
@Autowired
private QueryTemplateProcessor queryTemplateProcessor;
+
@Test
- void QueryTemplateProcessorProcessTest() {
+ void QueryTemplateProcessorProcessTest() {
- QueryProcessDTO process = queryTemplateProcessor.process("1770984442920292354", "123",null);
+ QueryProcessDTO process = queryTemplateProcessor.process("1770984442920292354", "123", null);
System.out.println(process);
}
@Autowired
private IrFileService irFileService;
+
@Test
void fileByteSaveTest() {
IrFile irFile = new IrFile();
@@ -136,7 +147,7 @@ class AskApplicationTests {
private RobotDataMapper robotDataMapper;
@Test
- void aaaTest() throws FileNotFoundException {
+ void base64WriteTest() throws FileNotFoundException {
/*AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(null)*/
@@ -149,4 +160,37 @@ class AskApplicationTests {
}
+
+ @Test
+ void videoLengthTest() throws IOException, UnsupportedAudioFileException {
+
+ MockMultipartFile mockMultipartFile = new MockMultipartFile("test.xls", "originalFilename",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ FileUtil.getInputStream("F:\\tmp\\1\\心肺听诊-大湿罗音.mp3"));
+
+
+ InputStream inputStream = mockMultipartFile.getInputStream();
+ try {
+ // 创建元数据对象
+ Metadata metadata = new Metadata();
+
+ // 使用Apache Tika的自动检测解析器和内容处理器
+ Parser parser = new AutoDetectParser();
+ BodyContentHandler handler = new BodyContentHandler();
+
+ BufferedInputStream inputStream1 = FileUtil.getInputStream("F:\\tmp\\1\\心肺听诊-大湿罗音.mp3");
+ // 解析音频文件，提取元数据
+ parser.parse(inputStream1, handler, metadata, new ParseContext());
+
+ // 获取音频文件的长度（时长），以秒为单位
+ String duration = metadata.get("xmpDM:duration");
+
+ System.out.println(duration);
+ if (duration != null) {
+ /*return (long) (Double.parseDouble(duration) / 1000); // 转换为毫秒*/
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}