Merge remote-tracking branch 'origin/dev_20250306_rz' into uat
This commit is contained in:
@@ -64,7 +64,7 @@ public class DiFyServiceImpl implements DiFyService{
|
|||||||
// 保存请求日志
|
// 保存请求日志
|
||||||
aiAnalysisRequestLogsMapper.insert(AiAnalysisRequestLogs.builder()
|
aiAnalysisRequestLogsMapper.insert(AiAnalysisRequestLogs.builder()
|
||||||
.aiAnalysisRequestId(aiAnalysisRequestId)
|
.aiAnalysisRequestId(aiAnalysisRequestId)
|
||||||
.businessRequest("")
|
.businessRequest(JSONObject.toJSONString(""))
|
||||||
.difyAgentKey(diFyReq.getFlowId())
|
.difyAgentKey(diFyReq.getFlowId())
|
||||||
.difyRequest(JSON.toJSONString(diFyReq))
|
.difyRequest(JSON.toJSONString(diFyReq))
|
||||||
.aiAnalysisRequestType(businessType)
|
.aiAnalysisRequestType(businessType)
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl<TmTelephoneCorpusM
|
|||||||
|
|
||||||
// 拼接 role 和 text
|
// 拼接 role 和 text
|
||||||
String chat = role + ": " + text;
|
String chat = role + ": " + text;
|
||||||
System.out.println(chat);
|
|
||||||
inputMap.put("chat",chat);
|
inputMap.put("chat",chat);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -98,14 +97,14 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl<TmTelephoneCorpusM
|
|||||||
if(null != execDifyFlow && execDifyFlow.get("status").equals("succeeded")){
|
if(null != execDifyFlow && execDifyFlow.get("status").equals("succeeded")){
|
||||||
|
|
||||||
String text = execDifyFlow.getJSONObject("outputs").getString("text");
|
String text = execDifyFlow.getJSONObject("outputs").getString("text");
|
||||||
String resultStrOne = FlowResultSplitUtil.flowOutputTextSplit(text, "### 任务1", "### 任务2");
|
String resultStrOne = FlowResultSplitUtil.flowOutputTextSplit(text, "任务1", "任务2");
|
||||||
String resultStrTwo =FlowResultSplitUtil.flowOutputTextSplit(text, "### 任务2", null);
|
String resultStrTwo =FlowResultSplitUtil.flowOutputTextSplit(text, "任务2", null);
|
||||||
Map<String, Object> ltoMap = new HashMap();
|
Map<String, String> ltoMap = new HashMap();
|
||||||
ltoMap.put("analysisRecordId", aicorpusTelephone.getSourceId());
|
ltoMap.put("analysisRecordId", aicorpusTelephone.getSourceId());
|
||||||
ltoMap.put("analysisScene", "2");
|
ltoMap.put("analysisScene", "2");
|
||||||
// ltoMap.put("unionId", aicorpusTelephone.getSourceId());
|
// ltoMap.put("unionId", aicorpusTelephone.getSourceId());
|
||||||
ltoMap.put("recordId", aicorpusTelephone.getSourceId());
|
ltoMap.put("recordId", aicorpusTelephone.getSourceId());
|
||||||
ltoMap.put("communicateDate", jsonObject.get("start_time"));
|
ltoMap.put("communicateDate", jsonObject.getString("start_time"));
|
||||||
ltoMap.put("analysisResult", resultStrOne);
|
ltoMap.put("analysisResult", resultStrOne);
|
||||||
ltoMap.put("analysisDetail", resultStrTwo);
|
ltoMap.put("analysisDetail", resultStrTwo);
|
||||||
// 发送MQ
|
// 发送MQ
|
||||||
@@ -128,21 +127,25 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl<TmTelephoneCorpusM
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getCarModelList(){
|
private String getCarModelList(){
|
||||||
long startTime = System.currentTimeMillis();
|
try {
|
||||||
CarModelReqDTO carModelReqDTO = new CarModelReqDTO();
|
long startTime = System.currentTimeMillis();
|
||||||
carModelReqDTO.setOnSale(10041001);
|
CarModelReqDTO carModelReqDTO = new CarModelReqDTO();
|
||||||
carModelReqDTO.setIsValid(10041001);
|
carModelReqDTO.setOnSale(10041001);
|
||||||
ResultDTO<List<CarModelRespDTO>> cardModelResult= remoteCarModelClient.queryCarModelList(carModelReqDTO);
|
carModelReqDTO.setIsValid(10041001);
|
||||||
log.info("queryCarModelList 导出查询耗时开始时间:{}",System.currentTimeMillis()-startTime);
|
ResultDTO<List<CarModelRespDTO>> cardModelResult= remoteCarModelClient.queryCarModelList(carModelReqDTO);
|
||||||
if (BizEnum.SUCCESS.getCode().toString().equals(cardModelResult.getReturnCode()) && CollectionUtils.isNotEmpty(cardModelResult.getData())) {
|
log.info("queryCarModelList 导出查询耗时开始时间:{}",System.currentTimeMillis()-startTime);
|
||||||
List<CarModelRespDTO> carModelRespDTOList = cardModelResult.getData();
|
if (BizEnum.SUCCESS.getCode().toString().equals(cardModelResult.getReturnCode()) && CollectionUtils.isNotEmpty(cardModelResult.getData())) {
|
||||||
// 拼接 modelName
|
List<CarModelRespDTO> carModelRespDTOList = cardModelResult.getData();
|
||||||
String modelNames = carModelRespDTOList.stream()
|
// 拼接 modelName
|
||||||
.map(CarModelRespDTO::getModelName) // 提取 modelName
|
String modelNames = carModelRespDTOList.stream()
|
||||||
.collect(Collectors.joining(", ")); // 用逗号和空格拼接
|
.map(CarModelRespDTO::getModelName) // 提取 modelName
|
||||||
|
.collect(Collectors.joining(", ")); // 用逗号和空格拼接
|
||||||
|
|
||||||
log.info("拼接后的车型名称: {}", modelNames);
|
log.info("拼接后的车型名称: {}", modelNames);
|
||||||
return modelNames;
|
return modelNames;
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("getCarModelList Exception: {}", e);
|
||||||
}
|
}
|
||||||
return "C40 RECHARGE、EM90、EX30、S60、S90、V60、V90、XC40、XC40 RECHARGE、XC60、XC90";
|
return "C40 RECHARGE、EM90、EX30、S60、S90、V60、V90、XC40、XC40 RECHARGE、XC60、XC90";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user