From 6506b50bffb1a1bfb20ee2e8e622b4882924270f Mon Sep 17 00:00:00 2001
From: qfrjava <13402782+qfrjava@user.noreply.gitee.com>
Date: 星期二, 04 三月 2025 09:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachTableDef.java | 1 -
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAttachTableSqlXml.java | 8 +++++++-
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java | 6 +++++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachTableDef.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachTableDef.java
index 1bda94e..3b70a87 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachTableDef.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachTableDef.java
@@ -7,7 +7,6 @@
import org.dom4j.Element;
import org.dom4j.Node;
-import com.smtaiserver.smtaiserver.core.SMTAIServerRequest;
import com.smtaiserver.smtaiserver.database.SMTDatabase.DBRecord;
import com.smtaiserver.smtaiserver.javaai.ast.ASTDBMap;
import com.smtservlet.util.Json;
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAttachTableSqlXml.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAttachTableSqlXml.java
index 63b9c41..e1d4825 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAttachTableSqlXml.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAttachTableSqlXml.java
@@ -124,7 +124,13 @@
if("like".equals(filter))
{
- sbWHERE.append(column + " LIKE '" + values.get(0).asString().replace("'", "''") + "'");
+ sbWHERE.append(column + " LIKE '%" + values.get(0).asString().replace("'", "''") + "%'");
+ }
+ else if("timerange".equals(filter))
+ {
+ sbWHERE.append(
+ column + " BETWEEN '" + values.get(0).asString().replace("'", "''") + "'::timestamp AND '"
+ + values.get(1).asString().replace("'", "''") + "'::timestamp");
}
else
throw new Exception("can't find filter op : " + filter);
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 34079e3..b0915ba 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
@@ -159,8 +159,12 @@
{
if(i > 0)
sbText.append(",");
- sbText.append(listRec.get(i).asString());
+ if(listRec.get(i).isNull())
+ sbText.append("");
+ else
+ sbText.append(listRec.get(i).asString());
}
+ sbText.append("\n");
}
sbText.append("\n");
list.add(sbText.toString());
--
Gitblit v1.9.3