From af9b852005fbdd493654e94ddbff5b9261fdb64b Mon Sep 17 00:00:00 2001
From: TangCheng <tangchengmail@163.com>
Date: 星期一, 28 四月 2025 15:16:36 +0800
Subject: [PATCH] Merge branch 'master' into agent_js
---
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachMetricDef.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachMetricDef.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachMetricDef.java
index bb232d6..4f141d6 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachMetricDef.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachMetricDef.java
@@ -1,13 +1,5 @@
package com.smtaiserver.smtaiserver.attach;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.dom4j.Document;
-import org.dom4j.Element;
-
import com.smtaiserver.smtaiserver.database.SMTDatabase;
import com.smtaiserver.smtaiserver.database.SMTDatabase.DBRecord;
import com.smtaiserver.smtaiserver.database.SMTDatabase.DBRecords;
@@ -15,6 +7,12 @@
import com.smtservlet.util.Json;
import com.smtservlet.util.SMTJsonWriter;
import com.smtservlet.util.SMTStatic;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.dom4j.Document;
+import org.dom4j.Element;
public class SMTAIAttachMetricDef
{
@@ -59,7 +57,8 @@
{
SMTDatabase db = dbMap.getDatabase(_sqlxmlName.getDSId());
String sql = _sqlxmlName.createSQL(null);
- DBRecords recs = db.querySQL("SELECT * FROM (" + sql + ") T WHERE title ILIKE ? LIMIT 5", new Object[] {"%" + name + "%"});
+// DBRecords recs = db.querySQL("SELECT * FROM (" + sql + ") T WHERE title ILIKE ? LIMIT 5", new Object[] {"%" + name + "%"});
+ DBRecords recs = db.querySQL("SELECT * FROM (" + sql + ") T WHERE title ILIKE ? ", new Object[] {"%" + name + "%"});
for(DBRecord rec : recs.getRecords())
{
jsonWr.beginMap(null);
@@ -72,14 +71,15 @@
}
}
- public void queryValueToJson(Date startTime, Date endTime, Json jsonQuotaKey, SMTJsonWriter jsonWr) throws Exception
+ public void queryValueToJson(Date startTime, Date endTime, Json jsonQuotaKey, SMTJsonWriter jsonWr,Integer limit) throws Exception
{
try(ASTDBMap dbMap = new ASTDBMap())
{
Map<String, String> mapArgs = new HashMap<>();
mapArgs.put("start_time", SMTStatic.toString(startTime));
mapArgs.put("end_time", SMTStatic.toString(endTime));
-
+ mapArgs.put("limit", SMTStatic.toString(limit));
+
for(Entry<String, Json> entry : jsonQuotaKey.asJsonMap().entrySet())
{
mapArgs.put(entry.getKey(), entry.getValue().asString());
--
Gitblit v1.9.3