From 7dfc29951aaf5ca3e60bfb2256a03d446b576175 Mon Sep 17 00:00:00 2001
From: TangCheng <tangchengmail@163.com>
Date: 星期日, 09 三月 2025 19:15:29 +0800
Subject: [PATCH] 调整附件指标输出格式
---
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachMetricDef.java | 18 ++++++++++++++----
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/control/SMTJavaAIControl.java | 2 --
2 files changed, 14 insertions(+), 6 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 71fa0dd..bb232d6 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
@@ -88,15 +88,25 @@
SMTDatabase db = dbMap.getDatabase(_sqlxmlName.getDSId());
String sql = _sqlxmlValue.createSQL(mapArgs);
DBRecords recs = db.querySQL(sql, null);
+
+ jsonWr.beginArray("columns");
+ {
+ jsonWr.addKeyValue(null, "鏃堕棿");
+ jsonWr.addKeyValue(null, _title);
+ }
+ jsonWr.endArray();
+
+ jsonWr.beginArray("records");
for(DBRecord rec : recs.getRecords())
{
- jsonWr.beginMap(null);
- for(Entry<String, Integer> entry : rec.getFieldMap().entrySet())
+ jsonWr.beginArray(null);
{
- jsonWr.addKeyValue(entry.getKey(), rec.getString(entry.getValue()));
+ jsonWr.addKeyValue(null, rec.getString("time"));
+ jsonWr.addKeyValue(null, rec.getString("value"));
}
- jsonWr.endMap();
+ jsonWr.endArray();
}
+ jsonWr.endArray();
}
}
}
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/control/SMTJavaAIControl.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/control/SMTJavaAIControl.java
index 0aefd90..143c5ba 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/control/SMTJavaAIControl.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/control/SMTJavaAIControl.java
@@ -1292,9 +1292,7 @@
SMTAIAttachMetricDef attachMetricDef = SMTAIServerApp.getApp().getAttachMetricDef(attachMetricId);
SMTJsonWriter jsonWr = tranReq.newReturnJsonWriter(true, null, null);
- jsonWr.beginArray("values");
attachMetricDef.queryValueToJson(startTime, endTime, jsonQuotaKeys, jsonWr);
- jsonWr.endArray();
return tranReq.returnJson(jsonWr);
}
--
Gitblit v1.9.3