项目优化

data-framework/pom.xml

@@ -25,11 +25,7 @@
             <version>20240303</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>3.4.1</version>
-        </dependency>
+
 
     </dependencies>
 

data-storage/src/main/java/com/huaxing/data/storage/service/abstracts/SqlConverterStatement.java → 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;
 

data-storage/src/main/java/com/huaxing/data/dolphindb/base/CommonService.java → 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();

data-storage/src/main/java/com/huaxing/data/storage/service/base/SqlConverterStatementHandle.java → 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;

data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbConfiguration.java → 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;

data-storage/src/main/java/com/huaxing/data/dolphindb/config/DolphinDbPoolConfiguration.java → 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;

data-storage/src/main/java/com/huaxing/data/dolphindb/connection/AbstractDbConnector.java → 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;

data-storage/src/main/java/com/huaxing/data/dolphindb/connection/DbConnectorHelper.java → 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

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;
 
 
 /**

data-storage/pom.xml

@@ -42,47 +42,14 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.18.2</version>
         </dependency>
-        <!--dolphindb 相关-->
-        <dependency>
-            <groupId>com.dolphindb</groupId>
-            <artifactId>jdbc</artifactId>
-            <version>3.00.0.1</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.dolphindb/dolphindb-javaapi -->
-        <dependency>
-            <groupId>com.dolphindb</groupId>
-            <artifactId>dolphindb-javaapi</artifactId>
-            <version>3.00.2.3</version>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>6.2.1</version>
         </dependency>
 
-        <!--mybatis的开发包-->
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-            <version>3.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.3.2</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
-            <version>3.4.1</version>
-        </dependency>
 
     </dependencies>
 

data-storage/src/main/java/com/huaxing/data/dolphindb/MyBatisConfig.java

@@ -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);
-    }
-}

data-storage/src/main/java/com/huaxing/data/storage/service/base/IDbSqlFactory.java

@@ -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<String, Object> map);
-
-    // 生成Stream表查询语句
-    String generateSelectStreamStatement(String tableName, Map<String, Object> map);
-
-    // 生成Dfs表查询语句
-    String generateSelectDfsStatement(String tableName, Map<String, Object> map);
-}

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;

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;
 

data-storage/src/main/java/com/huaxing/data/test/controller/TestController.java → 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<Map<String, Object>>  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流表 创建 ======================================
 
 
 

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

pom.xml

@@ -22,6 +22,57 @@
             <version>RELEASE</version>
             <scope>provided</scope>
         </dependency>
+        <!--mybatis的开发包-->
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>3.0.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--dolphindb 相关-->
+        <dependency>
+            <groupId>com.dolphindb</groupId>
+            <artifactId>jdbc</artifactId>
+            <version>3.00.0.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.dolphindb/dolphindb-javaapi -->
+        <dependency>
+            <groupId>com.dolphindb</groupId>
+            <artifactId>dolphindb-javaapi</artifactId>
+            <version>3.00.2.3</version>
+        </dependency>
     </dependencies>