Commit 55db594ec49649dbf18305aea7b23ae2aa0b579a
1 parent
4908ee24
添加未清选择 改成动态引导语
Showing
1 changed file
with
3 additions
and
2 deletions
src/main/java/com/xly/service/XlyErpService.java
| @@ -377,7 +377,7 @@ public class XlyErpService { | @@ -377,7 +377,7 @@ public class XlyErpService { | ||
| 377 | ){ | 377 | ){ |
| 378 | input = session.getCurrentTool().getSMethodName()+","+input; | 378 | input = session.getCurrentTool().getSMethodName()+","+input; |
| 379 | } | 379 | } |
| 380 | - sReturnType = (session!=null && ObjectUtil.isNotEmpty(session.getCurrentTool()) && session.getCurrentTool().getBQuo())?ReturnTypeCode.JSON.getCode():ReturnTypeCode.HTML.getCode(); | 380 | + sReturnType = JSONUtil.isTypeJSON(session.getSFunPrompts())?ReturnTypeCode.JSON.getCode():ReturnTypeCode.HTML.getCode(); |
| 381 | //动态方法或返回需要提示的信息 | 381 | //动态方法或返回需要提示的信息 |
| 382 | if(ObjectUtil.isNotEmpty(session.getSFunPrompts()) && !isConfirmed){ | 382 | if(ObjectUtil.isNotEmpty(session.getSFunPrompts()) && !isConfirmed){ |
| 383 | return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(session.getSFunPrompts()).sReturnType(sReturnType).build(); | 383 | return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(session.getSFunPrompts()).sReturnType(sReturnType).build(); |
| @@ -415,6 +415,7 @@ public class XlyErpService { | @@ -415,6 +415,7 @@ public class XlyErpService { | ||
| 415 | //2.处理工具参数采集结束后业务逻辑处理 | 415 | //2.处理工具参数采集结束后业务逻辑处理 |
| 416 | //调用方法,参数缺失部分提示，就直接使用方法返回的 | 416 | //调用方法,参数缺失部分提示，就直接使用方法返回的 |
| 417 | sResponMessage = dynamicToolProvider.doDynamicTool(session.getCurrentTool(),session); | 417 | sResponMessage = dynamicToolProvider.doDynamicTool(session.getCurrentTool(),session); |
| 418 | + sReturnType = JSONUtil.isTypeJSON(sResponMessage)?ReturnTypeCode.JSON.getCode():ReturnTypeCode.HTML.getCode(); | ||
| 418 | return AiResponseDTO.builder().sSceneName(sceneName) | 419 | return AiResponseDTO.builder().sSceneName(sceneName) |
| 419 | .sMethodName(methodName) | 420 | .sMethodName(methodName) |
| 420 | .aiText(sResponMessage) | 421 | .aiText(sResponMessage) |
| @@ -422,7 +423,7 @@ public class XlyErpService { | @@ -422,7 +423,7 @@ public class XlyErpService { | ||
| 422 | .sCopyToSrcId(session.getSCopyToSrcId()) | 423 | .sCopyToSrcId(session.getSCopyToSrcId()) |
| 423 | .dbType(session.getDbType()) | 424 | .dbType(session.getDbType()) |
| 424 | .dbCach(session.getDbCach()) | 425 | .dbCach(session.getDbCach()) |
| 425 | - .sReturnType(isConfirmed?ReturnTypeCode.HTML.getCode():sReturnType) | 426 | + .sReturnType(sReturnType) |
| 426 | .build(); | 427 | .build(); |
| 427 | }else if(session.getCurrentScene()== null ){ | 428 | }else if(session.getCurrentScene()== null ){ |
| 428 | return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText("当前场景:没有选择 退回当前场景 请输入 "+ CommonConstant.RESET + sResponMessage).dbType(session.getDbType()).dbCach(session.getDbCach()).sReturnType(sReturnType).build(); | 429 | return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText("当前场景:没有选择 退回当前场景 请输入 "+ CommonConstant.RESET + sResponMessage).dbType(session.getDbType()).dbCach(session.getDbCach()).sReturnType(sReturnType).build(); |