diff --git a/data-framework/pom.xml b/data-framework/pom.xml index 930436f..a60d417 100644 --- a/data-framework/pom.xml +++ b/data-framework/pom.xml @@ -25,11 +25,7 @@ 20240303 - - org.springframework.boot - spring-boot-starter-web - 3.4.1 - + diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/abstracts/SqlConverterStatement.java b/data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java similarity index 90% rename from data-storage/src/main/java/com/huaxing/data/storage/service/abstracts/SqlConverterStatement.java rename to data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java index 930ffc2..b22c9eb 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/abstracts/SqlConverterStatement.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java @@ -1,4 +1,4 @@ -package com.huaxing.data.storage.service.abstracts; +package com.huaxing.dolphindb.abstracts; import java.util.Map; diff --git a/data-storage/src/main/java/com/huaxing/data/dolphindb/base/CommonService.java b/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java similarity index 81% rename from data-storage/src/main/java/com/huaxing/data/dolphindb/base/CommonService.java rename to data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java index b66d585..0d3ef7e 100644 --- a/data-storage/src/main/java/com/huaxing/data/dolphindb/base/CommonService.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java @@ -1,11 +1,10 @@ -package com.huaxing.data.dolphindb.base; +package com.huaxing.dolphindb.base; -import com.huaxing.data.dolphindb.connection.AbstractDbConnector; -import com.huaxing.data.storage.service.base.SqlConverterStatementHandle; +import com.huaxing.dolphindb.connection.AbstractDbConnector; import com.xxdb.DBConnection; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; import java.io.IOException; import java.util.List; @@ -34,6 +33,7 @@ public class CommonService extends SqlConverterStatementHandle { try { connection.run(sql); } catch (IOException e) { + log.error("AbstractDbConnector.executeOnce() Method执行异常：{}", e.getMessage()); throw new RuntimeException(e); } finally { connection.close(); @@ -50,6 +50,7 @@ public class CommonService extends SqlConverterStatementHandle { try { connection.run(sql); } catch (IOException e) { + log.error("AbstractDbConnector.exec() Method执行异常：{}", e.getMessage()); throw new RuntimeException(e); } finally { connection.close(); @@ -67,6 +68,7 @@ public class CommonService extends SqlConverterStatementHandle { connection.run(sql); } catch (IOException e) { log.error("AbstractDbConnector.executeBatch() Method执行异常：{}", e.getMessage()); + throw new RuntimeException(e); } }); connection.close(); diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/base/SqlConverterStatementHandle.java b/data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java similarity index 94% rename from data-storage/src/main/java/com/huaxing/data/storage/service/base/SqlConverterStatementHandle.java rename to data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java index f8db948..fab7143 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/base/SqlConverterStatementHandle.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java @@ -1,6 +1,6 @@ -package com.huaxing.data.storage.service.base; +package com.huaxing.dolphindb.base; -import com.huaxing.data.storage.service.abstracts.SqlConverterStatement; +import com.huaxing.dolphindb.abstracts.SqlConverterStatement; import java.util.List; import java.util.Map; diff --git a/data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbConfiguration.java b/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java similarity index 97% rename from data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbConfiguration.java rename to data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java index 217f824..fa1338f 100644 --- a/data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbConfiguration.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java @@ -1,4 +1,4 @@ -package com.huaxing.data.dolphindb.config; +package com.huaxing.dolphindb.config; import com.xxdb.*; import lombok.Getter; diff --git a/data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbPoolConfiguration.java b/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java similarity index 94% rename from data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbPoolConfiguration.java rename to data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java index 4591b75..4fe73f1 100644 --- a/data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbPoolConfiguration.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java @@ -1,4 +1,4 @@ -package com.huaxing.data.dolphindb.config; +package com.huaxing.dolphindb.config; import com.xxdb.*; import lombok.extern.slf4j.Slf4j; diff --git a/data-storage/src/main/java/com/huaxing/data/dolphindb/connection/AbstractDbConnector.java b/data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java similarity index 92% rename from data-storage/src/main/java/com/huaxing/data/dolphindb/connection/AbstractDbConnector.java rename to data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java index db5effc..cb3e648 100644 --- a/data-storage/src/main/java/com/huaxing/data/dolphindb/connection/AbstractDbConnector.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java @@ -1,4 +1,4 @@ -package com.huaxing.data.dolphindb.connection; +package com.huaxing.dolphindb.connection; import com.xxdb.DBConnection; import lombok.experimental.Accessors; diff --git a/data-storage/src/main/java/com/huaxing/data/dolphindb/connection/DbConnectorHelper.java b/data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java similarity index 80% rename from data-storage/src/main/java/com/huaxing/data/dolphindb/connection/DbConnectorHelper.java rename to data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java index 04e9f29..f731ef5 100644 --- a/data-storage/src/main/java/com/huaxing/data/dolphindb/connection/DbConnectorHelper.java +++ b/data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java @@ -1,11 +1,12 @@ -package com.huaxing.data.dolphindb.connection; +package com.huaxing.dolphindb.connection; -import com.huaxing.data.dolphindb.config.DolphinDbConfiguration; -import com.huaxing.data.dolphindb.config.DolphinDbPoolConfiguration; +import com.huaxing.dolphindb.config.DolphinDbConfiguration; +import com.huaxing.dolphindb.config.DolphinDbPoolConfiguration; import com.xxdb.DBConnection; -import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; + /** * @ProjectName: iot-data-bridge * @Package: com.huaxing.data.dolphindb.connection diff --git a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java b/data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java index 37de71b..0e91477 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java +++ b/data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java @@ -1,7 +1,6 @@ package com.huaxing.mqtt.config; import com.huaxing.common.constant.MqttConstant; -import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; @@ -14,6 +13,7 @@ import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; +import javax.annotation.Resource; /** diff --git a/data-storage/pom.xml b/data-storage/pom.xml index 3aab973..2550459 100644 --- a/data-storage/pom.xml +++ b/data-storage/pom.xml @@ -42,47 +42,14 @@ jackson-databind 2.18.2 - - - com.dolphindb - jdbc - 3.00.0.1 - - - - com.dolphindb - dolphindb-javaapi - 3.00.2.3 - + org.springframework spring-web 6.2.1 - - - org.mybatis - mybatis - 3.5.5 - - - org.mybatis - mybatis-spring - 3.0.4 - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.3.2 - - - org.springframework.boot - spring-boot-starter-jdbc - 3.4.1 - diff --git a/data-storage/src/main/java/com/huaxing/data/dolphindb/MyBatisConfig.java b/data-storage/src/main/java/com/huaxing/data/dolphindb/MyBatisConfig.java deleted file mode 100644 index a459535..0000000 --- a/data-storage/src/main/java/com/huaxing/data/dolphindb/MyBatisConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.huaxing.data.dolphindb; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.SqlSessionTemplate; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import javax.sql.DataSource; - - -@Configuration -public class MyBatisConfig { - @Bean - public SqlSessionFactory sqlSessionFactory(@Qualifier(value = "dataSource") DataSource dataSource) throws Exception { - SqlSessionFactoryBean bean = new SqlSessionFactoryBean(); - bean.setDataSource(dataSource); - // 设置 Mapper 的 XML 文件位置 - ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - bean.setMapperLocations(resolver.getResources("classpath:com/huaxing/data/storage/mapper/*.xml")); - return bean.getObject(); - } - - - @Bean - public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory sqlSessionFactory) { - return new SqlSessionTemplate(sqlSessionFactory); - } -} \ No newline at end of file diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/base/IDbSqlFactory.java b/data-storage/src/main/java/com/huaxing/data/storage/service/base/IDbSqlFactory.java deleted file mode 100644 index 8ebc938..0000000 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/base/IDbSqlFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.huaxing.data.storage.service.base; - -import java.util.Map; - -/** - * @author 孟剑 - * @date 2025-01-16 16:54 - */ -public interface IDbSqlFactory { - - // 生成插入流式语句 - String generateInsertStreamStatement(String tableName, Map map); - - // 生成Stream表查询语句 - String generateSelectStreamStatement(String tableName, Map map); - - // 生成Dfs表查询语句 - String generateSelectDfsStatement(String tableName, Map map); -} diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java b/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java index b01ae55..c78aaf8 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java +++ b/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java @@ -3,7 +3,7 @@ package com.huaxing.data.storage.service.impl; import com.huaxing.data.storage.domain.DataAnalysisDTO; import com.huaxing.data.storage.mapper.IDeviceDataStoredMapper; import com.huaxing.data.storage.service.IDeviceDataStoredService; -import com.huaxing.data.dolphindb.base.CommonService; +import com.huaxing.dolphindb.base.CommonService; import com.huaxing.common.util.JacksonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; 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 63b02cf..0bfa58d 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 @@ -1,6 +1,6 @@ package com.huaxing.data.tablemanagement.service.impl; -import com.huaxing.data.dolphindb.base.CommonService; +import com.huaxing.dolphindb.base.CommonService; import com.huaxing.data.tablemanagement.service.ITableStructureService; import org.springframework.stereotype.Service; diff --git a/data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java b/data-storage/src/main/java/com/huaxing/test/controller/TestController.java similarity index 95% rename from data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java rename to data-storage/src/main/java/com/huaxing/test/controller/TestController.java index aa372dc..74eef28 100644 --- a/data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java +++ b/data-storage/src/main/java/com/huaxing/test/controller/TestController.java @@ -1,4 +1,4 @@ -package com.huaxing.data.test.controller; +package com.huaxing.test.controller; import com.huaxing.data.storage.domain.DataAnalysisDTO; import com.huaxing.data.storage.service.IDeviceDataQueryDfsService; @@ -66,7 +66,7 @@ public class TestController { // =============================================== 测试订阅流表查询 ====================================== @GetMapping(value = "/testSelectStream") public List> testSelectStream() { - String sql = "select * from ZbWaterMeter1Stream"; + String sql = "select * from WaterMeterTset1Stream"; return dataQueryStreamService.selectList(sql); } @@ -122,7 +122,7 @@ public class TestController { return map; } - // =============================================== 创建Dfs表 Stream流表 创建 ====================================== + // =============================================== TODO 创建Dfs表 Stream流表 创建 ====================================== diff --git a/data-storage/src/main/resources/application.yml b/data-storage/src/main/resources/application.yml index c7edbd7..700c028 100644 --- a/data-storage/src/main/resources/application.yml +++ b/data-storage/src/main/resources/application.yml @@ -13,7 +13,7 @@ spring: lazy-initialization: false mybatis: - mapper-locations: classpath:com/huaxing/data/storage/mapper/*.xml + mapper-locations: classpath:com/huaxing/**/mapper/*.xml type-aliases-package: com.huaxing.data.storage.entity configuration: map-underscore-to-camel-case: true diff --git a/pom.xml b/pom.xml index 552afd4..51e2698 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,57 @@ RELEASE provided + + + org.mybatis + mybatis + 3.5.5 + + + org.mybatis + mybatis-spring + 3.0.4 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.3.2 + + + + org.springframework.boot + spring-boot-starter-jdbc + 3.4.1 + + + org.springframework.boot + spring-boot-starter-web + 3.4.1 + + + org.mybatis + mybatis + 3.5.17 + + + org.mybatis + mybatis-spring + 3.0.4 + compile + + + + com.dolphindb + jdbc + 3.00.0.1 + + + + com.dolphindb + dolphindb-javaapi + 3.00.2.3 +