Java：MultiDataSource 暂时注释 IoTDB 的依赖和配置，避免不需要的用户可能碰到 Maven 下载和编译问题

TommyLemon · TommyLemon · commit 377393d394e3 · 2024-12-22T22:34:21.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml
@@ -76,16 +76,16 @@
             <artifactId>apijson-router</artifactId>
             <version>2.0.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>iotdb-jdbc</artifactId>
-            <version>1.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>iotdb-session</artifactId>
-            <version>1.3.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.iotdb</groupId>-->
+<!--            <artifactId>iotdb-jdbc</artifactId>-->
+<!--            <version>1.3.1</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.iotdb</groupId>-->
+<!--            <artifactId>iotdb-session</artifactId>-->
+<!--            <version>1.3.1</version>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>com.github.APIJSON</groupId>-->
 <!--            <artifactId>apijson-milvus</artifactId>-->
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLConfig.java b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLConfig.java
@@ -24,7 +24,7 @@
 
 import apijson.*;
 //import apijson.influxdb.InfluxDBUtil;
-import apijson.iotdb.IoTDBUtil;
+//import apijson.iotdb.IoTDBUtil;
 import apijson.orm.AbstractParser;
 import apijson.orm.AbstractSQLConfig;
 import apijson.orm.Parser;
@@ -452,20 +452,17 @@ protected int getMaxCombineCount() {
 		return 10;
 	}
 
-
-
-	// TODO 迁移到 apijson-influxdb 主项目 <<<<<<<<<<<<<<<<<<<<
-	@Override
-	public String getSchema() {
-		return IoTDBUtil.getSchema(super.getSchema(), DEFAULT_SCHEMA, isIoTDB());
-	}
-
-	@Override
-	public String getSQLSchema() {
-		return IoTDBUtil.getSQLSchema(super.getSQLSchema().replaceAll("-", "."), isIoTDB());
-	}
-
-	// TODO 迁移到 apijson-influxdb 主项目 >>>>>>>>>>>>>>>>>>>>>>
+//	@Override
+//	public String getSchema() {
+//		return InfluxDBUtil.getSchema(super.getSchema(), DEFAULT_SCHEMA, isIoTDB());
+////		return IoTDBUtil.getSchema(super.getSchema(), DEFAULT_SCHEMA, isIoTDB());
+//	}
+//
+//	@Override
+//	public String getSQLSchema() {
+//		return InfluxDBUtil.getSQLSchema(super.getSQLSchema(), isIoTDB());
+////		return IoTDBUtil.getSQLSchema(super.getSQLSchema().replaceAll("-", "."), isIoTDB());
+//	}
 
 	@Override
 	public String getSQLTable() {
@@ -474,10 +471,10 @@ public String getSQLTable() {
 	//	return isInfluxDB() ? t.toLowerCase() : StringUtil.firstCase(JSONRequest.recoverUnderline(t, false), false);
 	}
 
-	@Override
-	public String getTablePath() {
-		return IoTDBUtil.getTablePath(super.getTablePath(), isIoTDB());
-	}
+//	@Override
+//	public String getTablePath() {
+//		return IoTDBUtil.getTablePath(super.getTablePath(), isIoTDB());
+//	}
 
 	// 取消注释可将前端传参驼峰命名转为蛇形命名 aBCdEfg => upper ? A_B_CD_EFG : a_b_cd_efg
 	//	@Override
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLExecutor.java b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLExecutor.java
@@ -21,7 +21,7 @@
 //import apijson.influxdb.InfluxDBUtil;
 //import apijson.milvus.MilvusUtil;
 //import apijson.mongodb.MongoUtil;
-import apijson.iotdb.IoTDBUtil;
+//import apijson.iotdb.IoTDBUtil;
 import apijson.orm.SQLConfig;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSONObject;
@@ -250,14 +250,13 @@ else if (sqlPrefix.startsWith("DELETE ")) {
 //
 //                resultList = InfluxDBUtil.executeQuery(config, sql, unknownType);
 //            }
-//            else
-            if (isIoTDB) {
-                if (isWrite) {
-                    return IoTDBUtil.executeUpdate(config, sql);
-                }
-
-                resultList = IoTDBUtil.executeQuery(config, sql, unknownType);
-            }
+//            else if (isIoTDB) {
+//                if (isWrite) {
+//                    return IoTDBUtil.executeUpdate(config, sql);
+//                }
+//
+//                resultList = IoTDBUtil.executeQuery(config, sql, unknownType);
+//            }
 
             // TODO 把 execute 内与缓存无关只与数据库读写逻辑相关的代码抽取到 executeSQL 函数
             result = resultList.isEmpty() ? new JSONObject() : resultList.get(0);
