From 9d7ddee9fae205fbca1e6aff2893967079003671 Mon Sep 17 00:00:00 2001
From: 秦芳睿 <1425609123@qq.com>
Date: 星期三, 12 三月 2025 10:34:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/file_Question' into file_Question
---
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerEncache.java | 9 +++++----
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/qwen/agent/SMTQwenAgentDuckLastValue.java | 6 ++++--
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerApp.java | 3 ++-
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java | 34 ++++++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerApp.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerApp.java
index fd55ca2..2c6dfb3 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerApp.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerApp.java
@@ -235,7 +235,7 @@
Map<String, SMTMetricsDef> mapResult = mapMapMetrics.get(groupId);
if(mapResult == null)
- throw new Exception("can't find metrics group : " + groupId);
+ return new HashMap<String, SMTMetricsDef>();
return mapResult;
}
@@ -302,6 +302,7 @@
_serverEncache.getMapThemeDefMap();
_serverEncache.getAttachTableDefMap();
_serverEncache.getAttachMetricDefMap();
+ _serverEncache.getQwenAgentManager();
}
public SMTMapTableDef getMapTableDef(String tableId) throws Exception
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerEncache.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerEncache.java
index a0a0f22..492f638 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerEncache.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerEncache.java
@@ -295,15 +295,16 @@
try
{
- // 璇诲彇鎵�鏈塧mis鐨刟gent
- db.querySQLNotify(
+ String sql =
" SELECT agent_id,agent_type,agent_xml,clz_name,clz_arguments, group_type, agent_title, agent_group, agent_order,inner_call"
+ " FROM ai_agent_amis A"
+ " LEFT JOIN ai_scene_group G ON A.agent_group = G.group_id"
+ " WHERE " + (debugMode ? " agent_order > 0 OR is_debug='Y'" : "agent_order > 0 AND is_debug IS NULL")
+ " ORDER BY abs(agent_order)"
- , null,
- new DBQueryNotify() {
+ ;
+
+ // 璇诲彇鎵�鏈塧mis鐨刟gent
+ db.querySQLNotify(sql, null, new DBQueryNotify() {
@Override
public boolean onNextRecord(DBRecord rec) throws Exception
{
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java
index 04780f0..5a992c1 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java
@@ -185,6 +185,40 @@
}
}
+ if(_jsonAttachMetrics != null)
+ {
+ for(Json jsonAttachTable : _jsonAttachMetrics.asJsonList())
+ {
+ StringBuilder sbText = new StringBuilder();
+ sbText.append("鐜版湁琛ㄦ牸锛�" + jsonAttachTable.getJson("title").asString() + "\n");
+ List<Json> jsonColumns = jsonAttachTable.getJson("columns").asJsonList();
+ for(int i = 0; i < jsonColumns.size(); i ++)
+ {
+ if(i > 0)
+ sbText.append(",");
+ sbText.append(jsonColumns.get(i).asString());
+ }
+ sbText.append("\n");
+ for(Json jsonRecord : jsonAttachTable.getJson("values").asJsonList())
+ {
+ List<Json> listRec = jsonRecord.asJsonList();
+ for(int i = 0; i < listRec.size(); i ++)
+ {
+ if(i > 0)
+ sbText.append(",");
+ if(listRec.get(i).isNull())
+ sbText.append("");
+ else
+ sbText.append(listRec.get(i).asString());
+ }
+ sbText.append("\n");
+ }
+ sbText.append("\n");
+ list.add(sbText.toString());
+ }
+ }
+
+
return list.size() == 0 ? null : list.toArray(new String[list.size()]);
}
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/qwen/agent/SMTQwenAgentDuckLastValue.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/qwen/agent/SMTQwenAgentDuckLastValue.java
index f6c9492..0786d9c 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/qwen/agent/SMTQwenAgentDuckLastValue.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/qwen/agent/SMTQwenAgentDuckLastValue.java
@@ -200,7 +200,7 @@
return false;
}
- public SMTJavaAIError queryQualityValueMap(ASTDBMap dbMap, Map<String, DBRecord> r_mapQualKey2Rec) throws Exception
+ public SMTJavaAIError queryQualityValueMap(ASTDBMap dbMap, SMTAIServerRequest tranReq, Map<String, DBRecord> r_mapQualKey2Rec) throws Exception
{
SQLXMLExecArg execArg = new SQLXMLExecArg();
@@ -209,6 +209,7 @@
return error;
SMTDatabase db = dbMap.getDatabase(_sqlxmlQueryQual._dsId);
+ tranReq.traceLLMDebug(execArg._sbSQLText.toString());
DBRecords recs = db.querySQL(execArg._sbSQLText.toString(), execArg._sqlParams.toArray(new Object[execArg._sqlParams.size()]));
StringBuilder sbKey = new StringBuilder();
@@ -277,6 +278,7 @@
// 鏌ヨ鎵�鏈夎澶�
SMTDatabase db = dbMap.getDatabase(_sqlxmlQueryDev._dsId);
+ tranReq.traceLLMDebug(execArg._sbSQLText.toString());
DBRecords recs = db.querySQL(execArg._sbSQLText.toString(), execArg._sqlParams.toArray(new Object[execArg._sqlParams.size()]));
// 灏嗚澶囧姞鍏ュ垪琛�
@@ -297,7 +299,7 @@
Map<String, DBRecord> mapQualKey2Rec = new HashMap<>();
// 鏌ヨ褰撳墠鎸囨爣涓嬫墍鏈夋渶鏂板��
- if((error = qualInfo.queryQualityValueMap(dbMap, mapQualKey2Rec)) != null)
+ if((error = qualInfo.queryQualityValueMap(dbMap, tranReq, mapQualKey2Rec)) != null)
return error;
// 閬嶅巻璁惧鍚嶇О锛屾妸鎸囨爣鎸傛帴涓婂幓
--
Gitblit v1.9.3