diff --git a/data-framework/pom.xml b/data-framework/pom.xml index 1dbba33..fb86669 100644 --- a/data-framework/pom.xml +++ b/data-framework/pom.xml @@ -11,5 +11,12 @@ data-framework framework + + + org.springframework + spring-beans + 6.2.1 + + \ No newline at end of file diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java b/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java index 0d3ef7e..bd3fbdb 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java @@ -3,8 +3,8 @@ package com.huaxing.dolphindb.base; import com.huaxing.dolphindb.connection.AbstractDbConnector; import com.xxdb.DBConnection; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import java.io.IOException; import java.util.List; @@ -20,8 +20,10 @@ import java.util.List; @Slf4j public class CommonService extends SqlConverterStatementHandle { - @Resource - AbstractDbConnector dbPool; + @Autowired + private AbstractDbConnector dbPool; + + /** * 执行单条sql diff --git a/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableStructureService.java b/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableStructureService.java index 0bfa58d..bdf6ef3 100644 --- a/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableStructureService.java +++ b/data-storage/src/main/java/com/huaxing/data/tablemanagement/service/impl/TableStructureService.java @@ -34,7 +34,7 @@ public class TableStructureService extends CommonService implements ITableStruct @Override public void addStreamColumn(String tableName, String columnName, String columnDefinition) throws SQLException { - exec("addColumn(" + tableName + ", " + columnName + "," + columnDefinition + ")"); + exec("addColumn(" + tableName + ", `" + columnName + "," + columnDefinition + ")"); } @Override diff --git a/data-storage/src/main/java/com/huaxing/test/TestController.java b/data-storage/src/main/java/com/huaxing/test/TestController.java index 2a415c5..b18e91a 100644 --- a/data-storage/src/main/java/com/huaxing/test/TestController.java +++ b/data-storage/src/main/java/com/huaxing/test/TestController.java @@ -73,8 +73,8 @@ public class TestController { // =============================================== 给指定的流表增加列字段 ====================================== @GetMapping(value = "/testStreamAddColumn") public void testStreamAddColumn() { - String tableName = "ZbWaterMeter1Stream"; - String columnName = "WM_WFA_Unit14"; + String tableName = "WaterMeterTsetStream"; + String columnName = "test"; String columnDefinition = "STRING"; try { tableStructureService.addStreamColumn(tableName, columnName, columnDefinition); @@ -88,8 +88,8 @@ public class TestController { // =============================================== 给指定的Dfs表增加列字段 ====================================== @GetMapping(value = "/testDfsAddColumn") public void testDfsAddColumn() { - String tableName = "ZbWaterMeter1Dfs"; - String columnName = "test2"; + String tableName = "WaterMeterTsetDfs"; + String columnName = "test"; String columnDefinition = "STRING"; try { tableStructureService.addDfsColumn(tableName, columnName, columnDefinition);