Merge remote-tracking branch 'origin/uat' into uat

This commit is contained in:
lxu75
2025-03-07 16:45:37 +08:00
2 changed files with 23 additions and 20 deletions

View File

@@ -65,7 +65,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)

View File

@@ -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,6 +127,7 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl<TmTelephoneCorpusM
} }
private String getCarModelList(){ private String getCarModelList(){
try {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
CarModelReqDTO carModelReqDTO = new CarModelReqDTO(); CarModelReqDTO carModelReqDTO = new CarModelReqDTO();
carModelReqDTO.setOnSale(10041001); carModelReqDTO.setOnSale(10041001);
@@ -144,6 +144,9 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl<TmTelephoneCorpusM
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";
} }