diff --git a/src/main/java/com/xly/service/XlyErpService.java b/src/main/java/com/xly/service/XlyErpService.java index 0f66589..b8b699c 100644 --- a/src/main/java/com/xly/service/XlyErpService.java +++ b/src/main/java/com/xly/service/XlyErpService.java @@ -377,7 +377,7 @@ public class XlyErpService { ){ input = session.getCurrentTool().getSMethodName()+","+input; } - sReturnType = (session!=null && ObjectUtil.isNotEmpty(session.getCurrentTool()) && session.getCurrentTool().getBQuo())?ReturnTypeCode.JSON.getCode():ReturnTypeCode.HTML.getCode(); + sReturnType = JSONUtil.isTypeJSON(session.getSFunPrompts())?ReturnTypeCode.JSON.getCode():ReturnTypeCode.HTML.getCode(); //动态方法或返回需要提示的信息 if(ObjectUtil.isNotEmpty(session.getSFunPrompts()) && !isConfirmed){ return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(session.getSFunPrompts()).sReturnType(sReturnType).build(); @@ -415,6 +415,7 @@ public class XlyErpService { //2.处理工具参数采集结束后业务逻辑处理 //调用方法,参数缺失部分提示,就直接使用方法返回的 sResponMessage = dynamicToolProvider.doDynamicTool(session.getCurrentTool(),session); + sReturnType = JSONUtil.isTypeJSON(sResponMessage)?ReturnTypeCode.JSON.getCode():ReturnTypeCode.HTML.getCode(); return AiResponseDTO.builder().sSceneName(sceneName) .sMethodName(methodName) .aiText(sResponMessage) @@ -422,7 +423,7 @@ public class XlyErpService { .sCopyToSrcId(session.getSCopyToSrcId()) .dbType(session.getDbType()) .dbCach(session.getDbCach()) - .sReturnType(isConfirmed?ReturnTypeCode.HTML.getCode():sReturnType) + .sReturnType(sReturnType) .build(); }else if(session.getCurrentScene()== null ){ return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText("当前场景:没有选择 退回当前场景 请输入 "+ CommonConstant.RESET + sResponMessage).dbType(session.getDbType()).dbCach(session.getDbCach()).sReturnType(sReturnType).build();