Commit 0013d0e92ecbce55edf728a1f390ecae36d41ebb
1 parent
160ef78c
1111
Showing
2 changed files
with
7 additions
and
1 deletions
src/main/java/com/xly/service/XlyErpService.java
| @@ -112,6 +112,8 @@ public class XlyErpService { | @@ -112,6 +112,8 @@ public class XlyErpService { | ||
| 112 | if(session.getBCleanMemory()){ | 112 | if(session.getBCleanMemory()){ |
| 113 | operableChatMemoryProvider.clearSpecifiedMemory(userId); | 113 | operableChatMemoryProvider.clearSpecifiedMemory(userId); |
| 114 | session.setCurrentTool(null); | 114 | session.setCurrentTool(null); |
| 115 | + UserSceneSessionService.ERP_AGENT_CACHE.remove(userId); | ||
| 116 | + UserSceneSessionService.CHAT_AGENT_CACHE.remove(userId); | ||
| 115 | session.setBCleanMemory(false); | 117 | session.setBCleanMemory(false); |
| 116 | } | 118 | } |
| 117 | // 6.找到方法并且本方法带表结构描述时，需要调用 自然语言转SQL智能体 | 119 | // 6.找到方法并且本方法带表结构描述时，需要调用 自然语言转SQL智能体 |
| @@ -150,6 +152,8 @@ public class XlyErpService { | @@ -150,6 +152,8 @@ public class XlyErpService { | ||
| 150 | operableChatMemoryProvider.clearSpecifiedMemory(userId); | 152 | operableChatMemoryProvider.clearSpecifiedMemory(userId); |
| 151 | session.setCurrentTool(null); | 153 | session.setCurrentTool(null); |
| 152 | session.setBCleanMemory(false); | 154 | session.setBCleanMemory(false); |
| 155 | + UserSceneSessionService.ERP_AGENT_CACHE.remove(userId); | ||
| 156 | + UserSceneSessionService.CHAT_AGENT_CACHE.remove(userId); | ||
| 153 | String sceneName = ObjectUtil.isNotEmpty(session.getCurrentScene())?session.getCurrentScene().getSSceneName():StrUtil.EMPTY; | 157 | String sceneName = ObjectUtil.isNotEmpty(session.getCurrentScene())?session.getCurrentScene().getSSceneName():StrUtil.EMPTY; |
| 154 | String methodName = ObjectUtil.isNotEmpty(session.getCurrentTool())?session.getCurrentTool().getSMethodName():StrUtil.EMPTY; | 158 | String methodName = ObjectUtil.isNotEmpty(session.getCurrentTool())?session.getCurrentTool().getSMethodName():StrUtil.EMPTY; |
| 155 | return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(StrUtil.EMPTY).systemText("清除记忆成功！").sReturnType(ReturnTypeCode.HTML.getCode()).build(); | 159 | return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(StrUtil.EMPTY).systemText("清除记忆成功！").sReturnType(ReturnTypeCode.HTML.getCode()).build(); |
| @@ -193,7 +197,7 @@ public class XlyErpService { | @@ -193,7 +197,7 @@ public class XlyErpService { | ||
| 193 | ); | 197 | ); |
| 194 | }catch (Exception e){ | 198 | }catch (Exception e){ |
| 195 | session.setCurrentTool(null); | 199 | session.setCurrentTool(null); |
| 196 | - resultExplain = "动态SQL执行错误,请提供更具体的问题或指令"; | 200 | + resultExplain = "信息模糊,请提供更具体的问题或指令"; |
| 197 | } | 201 | } |
| 198 | log.info("动态表结构NL2SQL流程执行完成"); | 202 | log.info("动态表结构NL2SQL流程执行完成"); |
| 199 | return resultExplain; | 203 | return resultExplain; |
src/main/java/com/xly/tool/DynamicToolProvider.java
| @@ -758,6 +758,8 @@ public class DynamicToolProvider implements ToolProvider { | @@ -758,6 +758,8 @@ public class DynamicToolProvider implements ToolProvider { | ||
| 758 | if("enum".equals(sType) && ObjectUtil.isEmpty(dataListNew)){ | 758 | if("enum".equals(sType) && ObjectUtil.isEmpty(dataListNew)){ |
| 759 | args.remove(name); | 759 | args.remove(name); |
| 760 | args.remove(sValue); | 760 | args.remove(sValue); |
| 761 | + result.remove(name); | ||
| 762 | + result.remove(sValue); | ||
| 761 | continue; | 763 | continue; |
| 762 | } | 764 | } |
| 763 | if(ObjectUtil.isNotEmpty(dataListNew)){ | 765 | if(ObjectUtil.isNotEmpty(dataListNew)){ |