From 0028aa2dc85b7c3c9ce4eb8c599136e92066105b Mon Sep 17 00:00:00 2001
From: TangCheng <tangchengmail@163.com>
Date: 星期二, 01 四月 2025 16:38:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/WI/Service.V1.0
---
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/database/SMTDatabase.java | 53 +++++++++++++++++++++++++----------------------------
JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerApp.java | 2 +-
2 files changed, 26 insertions(+), 29 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 b095a96..43ad403 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
@@ -241,7 +241,7 @@
dsDataSource.setUrl(dbUrl);
dsDataSource.setUsername(dbUser);
dsDataSource.setPassword(dbPass);
- dsDataSource.setValidationQuery(_dbAlidationQuery);
+// dsDataSource.setValidationQuery(_dbAlidationQuery);
dsDataSource.setMaxActive(_dbMaxActive);
dsDataSource.setInitialSize(0);
dsDataSource.setMinIdle(0);
diff --git a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/database/SMTDatabase.java b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/database/SMTDatabase.java
index 2a180ef..7fbf4b7 100644
--- a/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/database/SMTDatabase.java
+++ b/JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/database/SMTDatabase.java
@@ -1,5 +1,7 @@
package com.smtaiserver.smtaiserver.database;
+import com.smtaiserver.smtaiserver.core.SMTAIServerApp;
+import com.smtservlet.util.SMTStatic;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -15,11 +17,8 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import com.smtaiserver.smtaiserver.core.SMTAIServerApp;
-import com.smtservlet.util.SMTStatic;
public class SMTDatabase implements AutoCloseable
{
@@ -709,40 +708,38 @@
ResultSetMetaData meta = rs.getMetaData();
int colCount = meta.getColumnCount();
String[] sColTypes = new String[colCount];
-
- for(int i = 0; i < colCount; i ++)
- {
- switch(meta.getColumnType(i + 1))
- {
+
+ for (int i = 0; i < colCount; i++) {
+ switch (meta.getColumnType(i + 1)) {
case java.sql.Types.BIGINT:
- sColTypes[i] = "bigint";
- break;
+ sColTypes[i] = "bigint";
+ break;
case java.sql.Types.FLOAT:
- sColTypes[i] = "float4";
- break;
-
+ sColTypes[i] = "float4";
+ break;
+
case java.sql.Types.DOUBLE:
- sColTypes[i] = "float8";
- break;
-
+ case java.sql.Types.NUMERIC:
+ case java.sql.Types.DECIMAL:
+ sColTypes[i] = "float8";
+ break;
case java.sql.Types.INTEGER:
- sColTypes[i] = "integer";
- break;
-
+ sColTypes[i] = "integer";
+ break;
case java.sql.Types.TIMESTAMP:
- sColTypes[i] = "timestamp";
- break;
-
+ sColTypes[i] = "timestamp";
+ break;
+ case java.sql.Types.CHAR:
case java.sql.Types.VARCHAR:
- sColTypes[i] = "varchar(" + meta.getColumnDisplaySize(i + 1) + ")";
- break;
-
+ sColTypes[i] = "varchar(" + meta.getColumnDisplaySize(i + 1) + ")";
+ break;
+
default:
- throw new Exception("unknow column type : " + meta.getColumnType(i+1));
- }
+ throw new Exception("unknow column type : " + meta.getColumnType(i + 1));
+ }
}
-
+
if(!((DBQueryNotifyMeta)notify).onMetaInfo(recs, sColTypes))
return;
}
--
Gitblit v1.9.3