Administrator / xlyAi

Commit 4f8672b2eb973962f3865892b5ea08d2b7290d6a

Authored by qianbao
1 parent ff5f5a19

AI 对于时间的处理

Inline Side-by-side
Showing 2 changed files with 11 additions and 12 deletions
src/main/java/com/xly/service/XlyErpService.java
  View file @4f8672b
... ... @@ -112,9 +112,9 @@ public class XlyErpService {
112 112 if (aiAgent == null){
113 113 return getChatiAgent (input, session,StrUtil.EMPTY);
114 114 }
115   - List<ChatMessage> chatMessage = operableChatMemoryProvider.getCurrentChatMessages(session.getUserId());
  115 +// List<ChatMessage> chatMessage = operableChatMemoryProvider.getCurrentChatMessages(session.getUserId());
116 116 String sResponMessage = aiAgent.chat(userId, input);
117   - List<ChatMessage> chatMessage2 = operableChatMemoryProvider.getCurrentChatMessages(session.getUserId());
  117 +// List<ChatMessage> chatMessage2 = operableChatMemoryProvider.getCurrentChatMessages(session.getUserId());
118 118 String sResponMessageOld = StrUtil.EMPTY;
119 119 // 调用方法,参数缺失部分提示，就直接使用方法返回的
120 120 if(session.getCurrentTool() != null
... ... @@ -480,11 +480,6 @@ public class XlyErpService {
480 480 .build();
481 481 UserSceneSessionService.CHAT_AGENT_CACHE.put(session.getUserId(), chatiAgent); }
482 482 String sChatMessage = chatiAgent.chat(session.getUserId(), input);
483   - //随便聊聊移除系统返回的提示记忆
484   -// List<ChatMessage> chatMessage = operableChatMemoryProvider.getCurrentChatMessages(session.getUserId());
485   -// removeMssageSbll(chatMessage, session.getUserId());
486   -// operableChatMemoryProvider.deleteUserLasterMessage(session.getUserId());
487   -// chatMessage = operableChatMemoryProvider.getCurrentChatMessages(session.getUserId());
488 483 return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText(sChatMessage).systemText(StrUtil.EMPTY).sReturnType(ReturnTypeCode.HTML.getCode()).build();
489 484 }
490 485 /***
... ...
src/main/java/com/xly/tool/DynamicToolProvider.java
  View file @4f8672b
... ... @@ -230,11 +230,11 @@ public class DynamicToolProvider implements ToolProvider {
230 230 StringBuffer sl = new StringBuffer();
231 231  
232 232 if(ObjectUtil.isNotEmpty(meta.getStoolDesc())){
233   - stoolDesc.append("MethodNo:").append(meta.getSMethodNo()).append(",核心工作内容:【").append(meta.getSMethodName());
  233 + stoolDesc.append("MethodNo:").append(meta.getSMethodNo()).append(",当用户").append(meta.getSMethodName());
234 234 // if (meta.getIBizType()==4){
235 235 // stoolDesc.append("，").append("并选择数据后执行["+meta.getSControlName()+"]操作");
236 236 // }
237   - stoolDesc.append("】").append(meta.getStoolDesc());
  237 + stoolDesc.append("时，必须调用本工具").append(meta.getSMethodNo()).append("，").append(meta.getStoolDesc());
238 238 if (meta.getIBizType()==4){
239 239 stoolDesc.append("，").append("并选择数据后执行 "+meta.getSControlName()+" 操作");
240 240 // .append("1.全部数据生成多个单据 回复【全部确认】；2.全部数据生成一个单据 回复【合并确认】；3.按自然语义描述生成一个单据 如＂1,3行确认＂");
... ... @@ -256,7 +256,8 @@ public class DynamicToolProvider implements ToolProvider {
256 256 String paramType = paramRule.getSType();
257 257 Boolean bEmpty = paramRule.getBEmpty();
258 258 String sExampleValue = paramRule.getSExampleValue();
259   - if(ObjectUtil.isNotEmpty(sExampleValue)){
  259 + //示例值，只有枚举放
  260 + if(ObjectUtil.isNotEmpty(sExampleValue) && "enum".equals(paramType.toLowerCase())){
260 261 //英文
261 262 // slMap.put(paramName,sExampleValue);
262 263 //中文
... ... @@ -534,7 +535,7 @@ public class DynamicToolProvider implements ToolProvider {
534 535 // Map<String, Object> argsOld = DeepCopyUtils.deepCopy(args);
535 536 List<ParamRule> paramRuleData = meta.getParamRuleListAll();
536 537 // 2. 【自动补全】应用参数的默认值
537   - args = applyDefaultValues(args, paramRuleData);
  538 +// args = applyDefaultValues(args, paramRuleData);
538 539  
539 540 // 2.1 【补全动态参数】动态参数补全
540 541 try{
... ... @@ -810,8 +811,11 @@ public class DynamicToolProvider implements ToolProvider {
810 811 Map<String, Object> result = new HashMap<>(args);
811 812 for (ParamRule pd : paramDefs) {
812 813 String name = pd.getSParam();
813   - if ((!result.containsKey(name) || ObjectUtil.isEmpty(result.get(name)))
  814 + if ((!result.containsKey(name)
  815 + || ObjectUtil.isEmpty(result.get(name)))
814 816 && ObjectUtil.isNotEmpty(pd.getSDefaultValue())
  817 + && !"enum".equals(pd.getSType())
  818 + && !"array".equals(pd.getSType())
815 819 ) {
816 820 Object defaultValue = pd.getSDefaultValue();
817 821 result.put(name, defaultValue);
... ...