变更项目目录结构

data-framework/pom.xml

@@ -4,18 +4,25 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.huaxing</groupId>
+        <groupId>com.huaxing.iot</groupId>
         <artifactId>data-bridge</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <artifactId>data-framework</artifactId>
     <description>framework</description>
+
+    <!-- 设置 Java 源版本和目标版本为 1.8 -->
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>6.2.1</version>
+            <version>5.3.20</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -25,8 +32,28 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>6.2.1</version>
+            <version>5.3.20</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>5.3.20</version>
         </dependency>
+
     </dependencies>
 
+    <!-- 显式配置 maven-compiler-plugin -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version> <!-- 可根据需要调整版本 -->
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

data-framework/src/main/java/com/huaxing/common/constant/AppConstant.java → data-framework/src/main/java/com/huaxing/iot/common/constant/AppConstant.java

@@ -1,4 +1,4 @@
-package com.huaxing.common.constant;
+package com.huaxing.iot.common.constant;
 
 /**
  * @ProjectName: iot-data-bridge

data-framework/src/main/java/com/huaxing/common/constant/MqttConstant.java → data-framework/src/main/java/com/huaxing/iot/common/constant/MqttConstant.java

@@ -1,4 +1,4 @@
-package com.huaxing.common.constant;
+package com.huaxing.iot.common.constant;
 /**
  * 常量
  */

data-framework/src/main/java/com/huaxing/common/exception/BaseException.java → data-framework/src/main/java/com/huaxing/iot/common/exception/BaseException.java

@@ -1,6 +1,6 @@
-package com.huaxing.common.exception;
+package com.huaxing.iot.common.exception;
 
-import com.huaxing.common.constant.AppConstant;
+import com.huaxing.iot.common.constant.AppConstant;
 import lombok.Getter;
 import lombok.ToString;
 import org.slf4j.Logger;

data-framework/src/main/java/com/huaxing/common/exception/BizException.java → data-framework/src/main/java/com/huaxing/iot/common/exception/BizException.java

@@ -1,6 +1,6 @@
-package com.huaxing.common.exception;
+package com.huaxing.iot.common.exception;
 
-import com.huaxing.common.constant.AppConstant;
+import com.huaxing.iot.common.constant.AppConstant;
 import org.springframework.util.StringUtils;
 
 public class BizException extends BaseException {

data-framework/src/main/java/com/huaxing/common/result/ResultVo.java → data-framework/src/main/java/com/huaxing/iot/common/result/ResultVo.java

@@ -1,7 +1,7 @@
-package com.huaxing.common.result;
+package com.huaxing.iot.common.result;
 
-import com.huaxing.common.constant.AppConstant;
-import com.huaxing.common.exception.BaseException;
+import com.huaxing.iot.common.constant.AppConstant;
+import com.huaxing.iot.common.exception.BaseException;
 import lombok.Getter;
 
 import java.io.Serializable;

data-framework/src/main/java/com/huaxing/common/util/JacksonUtil.java → data-framework/src/main/java/com/huaxing/iot/common/util/JacksonUtil.java

@@ -1,4 +1,4 @@
-package com.huaxing.common.util;
+package com.huaxing.iot.common.util;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;

data-framework/src/main/java/com/huaxing/common/util/StrUtils.java → data-framework/src/main/java/com/huaxing/iot/common/util/StrUtils.java

@@ -1,4 +1,4 @@
-package com.huaxing.common.util;
+package com.huaxing.iot.common.util;
 
 /**
  * @ProjectName: data-bridge

data-framework/src/main/java/com/huaxing/mqtt/config/MqttConfiguration.java → data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttConfiguration.java

@@ -1,4 +1,4 @@
-package com.huaxing.mqtt.config;
+package com.huaxing.iot.mqtt.config;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -23,7 +23,7 @@ import java.util.List;
 @Getter
 @Configuration
 @ConfigurationProperties("mqtt")
-@IntegrationComponentScan(basePackages = "com.huaxing.mqtt.*")
+@IntegrationComponentScan(basePackages = "com.huaxing.iot.mqtt.*")
 public class MqttConfiguration {
 
     /**

data-framework/src/main/java/com/huaxing/mqtt/config/MqttConsumerConfiguration.java → data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttConsumerConfiguration.java

@@ -1,7 +1,7 @@
-package com.huaxing.mqtt.config;
+package com.huaxing.iot.mqtt.config;
 
-import com.huaxing.common.constant.MqttConstant;
-import com.huaxing.mqtt.processor.MqttMessageReceiver;
+import com.huaxing.iot.common.constant.MqttConstant;
+import com.huaxing.iot.mqtt.processor.MqttMessageReceiver;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java → data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttProducerConfiguration.java

@@ -1,6 +1,6 @@
-package com.huaxing.mqtt.config;
+package com.huaxing.iot.mqtt.config;
 
-import com.huaxing.common.constant.MqttConstant;
+import com.huaxing.iot.common.constant.MqttConstant;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;

data-framework/src/main/java/com/huaxing/mqtt/processor/MqttGateway.java → data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttGateway.java

@@ -1,4 +1,4 @@
-package com.huaxing.mqtt.processor;
+package com.huaxing.iot.mqtt.processor;
 
 import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.mqtt.support.MqttHeaders;

data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageReceiver.java → data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttMessageReceiver.java

@@ -1,4 +1,4 @@
-package com.huaxing.mqtt.processor;
+package com.huaxing.iot.mqtt.processor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.MessageHandler;

data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageSender.java → data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttMessageSender.java

@@ -1,4 +1,4 @@
-package com.huaxing.mqtt.processor;
+package com.huaxing.iot.mqtt.processor;
 
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;

data-storage-api/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.huaxing</groupId>
+        <groupId>com.huaxing.iot</groupId>
         <artifactId>data-bridge</artifactId>
         <version>1.0.0</version>
     </parent>
@@ -13,10 +13,11 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.huaxing</groupId>
@@ -31,11 +32,13 @@
             <version>2.2.9.RELEASE</version>
         </dependency>
 
+        <!-- 更换为 Java 8 兼容的版本 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-context</artifactId>
-            <version>3.1.4</version>
+            <version>2.2.9.RELEASE</version>
         </dependency>
+
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
@@ -43,4 +46,17 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

data-storage-api/src/main/java/com/huaxing/feign/IDatabaseClientFeign.java → data-storage-api/src/main/java/com/huaxing/iot/feign/IDatabaseClientFeign.java

@@ -1,10 +1,10 @@
-package com.huaxing.feign;
+package com.huaxing.iot.feign;
 
-import com.huaxing.common.constant.AppConstant;
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.feign.fallback.DatabaseFeignFallbackFactory;
-import com.huaxing.pojo.dto.DatabaseDTO;
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.common.constant.AppConstant;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.feign.fallback.DatabaseFeignFallbackFactory;
+import com.huaxing.iot.pojo.dto.DatabaseDTO;
+import com.huaxing.iot.pojo.dto.TableDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

data-storage-api/src/main/java/com/huaxing/feign/fallback/DatabaseFeignFallbackFactory.java → data-storage-api/src/main/java/com/huaxing/iot/feign/fallback/DatabaseFeignFallbackFactory.java

@@ -1,9 +1,9 @@
-package com.huaxing.feign.fallback;
+package com.huaxing.iot.feign.fallback;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.feign.IDatabaseClientFeign;
-import com.huaxing.pojo.dto.DatabaseDTO;
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.feign.IDatabaseClientFeign;
+import com.huaxing.iot.pojo.dto.DatabaseDTO;
+import com.huaxing.iot.pojo.dto.TableDTO;
 import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

data-storage-api/src/main/java/com/huaxing/pojo/dto/DataQueryDTO.java → data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/DataQueryDTO.java

@@ -1,4 +1,4 @@
-package com.huaxing.pojo.dto;
+package com.huaxing.iot.pojo.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

data-storage-api/src/main/java/com/huaxing/pojo/dto/DatabaseDTO.java → data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/DatabaseDTO.java

@@ -1,4 +1,4 @@
-package com.huaxing.pojo.dto;
+package com.huaxing.iot.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

data-storage-api/src/main/java/com/huaxing/pojo/dto/TableColumnDTO.java → data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/TableColumnDTO.java

@@ -1,4 +1,4 @@
-package com.huaxing.pojo.dto;
+package com.huaxing.iot.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

data-storage-api/src/main/java/com/huaxing/pojo/dto/TableDTO.java → data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/TableDTO.java

@@ -1,4 +1,4 @@
-package com.huaxing.pojo.dto;
+package com.huaxing.iot.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

data-storage/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.huaxing</groupId>
+        <groupId>com.huaxing.iot</groupId>
         <artifactId>data-bridge</artifactId>
         <version>1.0.0</version>
     </parent>
@@ -12,6 +12,13 @@
     <artifactId>data-storage</artifactId>
     <packaging>jar</packaging>
 
+    <!-- 设置 Java 源版本和目标版本为 1.8 -->
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
         <!-- 引入data-common -->
         <dependency>
@@ -23,53 +30,47 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>3.4.1</version>
+            <version>2.2.6.RELEASE</version>
         </dependency>
 
-
+        <!-- 检查 mybatis-plus-core 版本是否兼容 Java 1.8 -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-core</artifactId>
-            <version>3.5.8</version>
+            <version>3.3.2</version> <!-- 选择兼容 Java 1.8 的版本 -->
         </dependency>
+
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
             <version>1.9.22.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.18.2</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>6.2.1</version>
+            <version>5.3.20</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <version>2.2.9.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>com.huaxing</groupId>
-            <artifactId>data-storage-api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
+
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
             <version>2.0.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.huaxing</groupId>
             <artifactId>data-storage-api</artifactId>
@@ -78,20 +79,99 @@
         </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>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+        <!-- 选择兼容 Java 8 的 Spring Integration 版本 -->
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+            <version>5.3.10.RELEASE</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>2.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+
+        <!-- 选择兼容 Java 8 的 Spring Boot 版本 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <version>2.2.13.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.2.13.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>2.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+            <!-- 选择兼容 Java 1.8 的 Spring Cloud 版本 -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>2021.0.5</version>
+                <version>Hoxton.SR12</version> <!-- 选择兼容 Java 1.8 的版本 -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
-
-
+    <!-- 显式配置 maven-compiler-plugin -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java → data-storage/src/main/java/com/huaxing/iot/IotDataBridgeApplication.java

@@ -1,11 +1,13 @@
-package com.huaxing;
+package com.huaxing.iot;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @EnableFeignClients
-@SpringBootApplication
+@MapperScan("com.huaxing.iot.data.storage.mapper")
+@SpringBootApplication(scanBasePackages = {"com.huaxing.iot"})
 public class IotDataBridgeApplication {
 
     public static void main(String[] args) {

data-storage/src/main/java/com/huaxing/data/api/controller/DataQueryController.java → data-storage/src/main/java/com/huaxing/iot/data/api/controller/DataQueryController.java

@@ -1,7 +1,7 @@
-package com.huaxing.data.api.controller;
+package com.huaxing.iot.data.api.controller;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.pojo.dto.DataQueryDTO;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.pojo.dto.DataQueryDTO;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

data-storage/src/main/java/com/huaxing/data/database/controller/DatabaseController.java → data-storage/src/main/java/com/huaxing/iot/data/database/controller/DatabaseController.java

@@ -1,10 +1,10 @@
-package com.huaxing.data.database.controller;
+package com.huaxing.iot.data.database.controller;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.data.database.service.IDatabaseService;
-import com.huaxing.data.database.service.ITableStructureService;
-import com.huaxing.pojo.dto.DatabaseDTO;
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.data.database.service.IDatabaseService;
+import com.huaxing.iot.data.database.service.ITableStructureService;
+import com.huaxing.iot.pojo.dto.DatabaseDTO;
+import com.huaxing.iot.pojo.dto.TableDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

data-storage/src/main/java/com/huaxing/data/database/service/IDatabaseService.java → data-storage/src/main/java/com/huaxing/iot/data/database/service/IDatabaseService.java

@@ -1,7 +1,7 @@
-package com.huaxing.data.database.service;
+package com.huaxing.iot.data.database.service;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.pojo.dto.DatabaseDTO;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.pojo.dto.DatabaseDTO;
 
 /**
  * 数据库操作

data-storage/src/main/java/com/huaxing/data/database/service/ITableStructureService.java → data-storage/src/main/java/com/huaxing/iot/data/database/service/ITableStructureService.java

@@ -1,8 +1,8 @@
-package com.huaxing.data.database.service;
+package com.huaxing.iot.data.database.service;
 
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.pojo.dto.TableDTO;
 
 /**
  * @ProjectName: iot-data-bridge

data-storage/src/main/java/com/huaxing/data/database/service/impl/DatabaseServiceImpl.java → data-storage/src/main/java/com/huaxing/iot/data/database/service/impl/DatabaseServiceImpl.java

@@ -1,11 +1,10 @@
-package com.huaxing.data.database.service.impl;
+package com.huaxing.iot.data.database.service.impl;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.data.database.service.IDatabaseService;
-import com.huaxing.data.database.template.ISqlTemplateService;
-import com.huaxing.dolphindb.base.CommonService;
-import com.huaxing.pojo.dto.DatabaseDTO;
-import com.xxdb.data.BasicBoolean;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.data.database.service.IDatabaseService;
+import com.huaxing.iot.data.database.template.ISqlTemplateService;
+import com.huaxing.iot.dolphindb.base.CommonService;
+import com.huaxing.iot.pojo.dto.DatabaseDTO;
 import com.xxdb.data.Entity;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +29,7 @@ public class DatabaseServiceImpl extends CommonService implements IDatabaseServi
     /**
      * @description: 检查数据库是否存在
      * @param databaseName 数据库名
-     * @return com.huaxing.common.result.ResultVo<?>
+     * @return com.huaxing.iot.result.common.ResultVo<?>
      * @author swordmeng8@163.com
      * @date 2025/2/12 13:48
      */

data-storage/src/main/java/com/huaxing/data/database/service/impl/TableStructureService.java → data-storage/src/main/java/com/huaxing/iot/data/database/service/impl/TableStructureService.java

@@ -1,10 +1,10 @@
-package com.huaxing.data.database.service.impl;
+package com.huaxing.iot.data.database.service.impl;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.data.database.template.ISqlTemplateService;
-import com.huaxing.dolphindb.base.CommonService;
-import com.huaxing.data.database.service.ITableStructureService;
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.common.result.ResultVo;
+import com.huaxing.iot.data.database.template.ISqlTemplateService;
+import com.huaxing.iot.dolphindb.base.CommonService;
+import com.huaxing.iot.data.database.service.ITableStructureService;
+import com.huaxing.iot.pojo.dto.TableDTO;
 import com.xxdb.data.BasicBoolean;
 import com.xxdb.data.Entity;
 import lombok.AllArgsConstructor;

data-storage/src/main/java/com/huaxing/data/database/template/ISqlTemplateService.java → data-storage/src/main/java/com/huaxing/iot/data/database/template/ISqlTemplateService.java

@@ -1,7 +1,7 @@
-package com.huaxing.data.database.template;
+package com.huaxing.iot.data.database.template;
 
 
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.pojo.dto.TableDTO;
 
 /**
  * 表创建模板

data-storage/src/main/java/com/huaxing/data/database/template/SqlTemplateServiceImpl.java → data-storage/src/main/java/com/huaxing/iot/data/database/template/SqlTemplateServiceImpl.java

@@ -1,7 +1,7 @@
-package com.huaxing.data.database.template;
+package com.huaxing.iot.data.database.template;
 
-import com.huaxing.dolphindb.base.CommonService;
-import com.huaxing.pojo.dto.TableDTO;
+import com.huaxing.iot.dolphindb.base.CommonService;
+import com.huaxing.iot.pojo.dto.TableDTO;
 import org.springframework.stereotype.Service;
 
 /**

data-storage/src/main/java/com/huaxing/data/storage/domain/DataAnalysisDTO.java → data-storage/src/main/java/com/huaxing/iot/data/storage/domain/DataAnalysisDTO.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.domain;
+package com.huaxing.iot.data.storage.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryDfsMapper.java → data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataQueryDfsMapper.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.mapper;
+package com.huaxing.iot.data.storage.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryStreamMapper.java → data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataQueryStreamMapper.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.mapper;
+package com.huaxing.iot.data.storage.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataStoredMapper.java → data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataStoredMapper.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.mapper;
+package com.huaxing.iot.data.storage.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

data-storage/src/main/java/com/huaxing/data/storage/service/IDataAnalysisService.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDataAnalysisService.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.service;
+package com.huaxing.iot.data.storage.service;
 
 /**
  * 入库数据解析服务

data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryDfsService.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataQueryDfsService.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.service;
+package com.huaxing.iot.data.storage.service;
 
 import java.util.List;
 import java.util.Map;

data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryStreamService.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataQueryStreamService.java

@@ -1,4 +1,4 @@
-package com.huaxing.data.storage.service;
+package com.huaxing.iot.data.storage.service;
 
 import java.util.List;
 import java.util.Map;

data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataStoredService.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataStoredService.java

@@ -1,6 +1,6 @@
-package com.huaxing.data.storage.service;
+package com.huaxing.iot.data.storage.service;
 
-import com.huaxing.data.storage.domain.DataAnalysisDTO;
+import com.huaxing.iot.data.storage.domain.DataAnalysisDTO;
 
 /**
  * ClassName: IDeviceDataStoredService

data-storage/src/main/java/com/huaxing/data/storage/service/impl/DataAnalysisService.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DataAnalysisService.java

@@ -1,9 +1,9 @@
-package com.huaxing.data.storage.service.impl;
+package com.huaxing.iot.data.storage.service.impl;
 
-import com.huaxing.data.storage.domain.DataAnalysisDTO;
-import com.huaxing.data.storage.service.IDataAnalysisService;
-import com.huaxing.data.storage.service.IDeviceDataStoredService;
-import com.huaxing.common.util.JacksonUtil;
+import com.huaxing.iot.data.storage.domain.DataAnalysisDTO;
+import com.huaxing.iot.data.storage.service.IDataAnalysisService;
+import com.huaxing.iot.data.storage.service.IDeviceDataStoredService;
+import com.huaxing.iot.common.util.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java

@@ -1,7 +1,7 @@
-package com.huaxing.data.storage.service.impl;
+package com.huaxing.iot.data.storage.service.impl;
 
-import com.huaxing.data.storage.mapper.IDeviceDataQueryDfsMapper;
-import com.huaxing.data.storage.service.IDeviceDataQueryDfsService;
+import com.huaxing.iot.data.storage.mapper.IDeviceDataQueryDfsMapper;
+import com.huaxing.iot.data.storage.service.IDeviceDataQueryDfsService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java

@@ -1,7 +1,7 @@
-package com.huaxing.data.storage.service.impl;
+package com.huaxing.iot.data.storage.service.impl;
 
-import com.huaxing.data.storage.mapper.IDeviceDataQueryStreamMapper;
-import com.huaxing.data.storage.service.IDeviceDataQueryStreamService;
+import com.huaxing.iot.data.storage.mapper.IDeviceDataQueryStreamMapper;
+import com.huaxing.iot.data.storage.service.IDeviceDataQueryStreamService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java → data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataStoredServiceImpl.java

@@ -1,10 +1,10 @@
-package com.huaxing.data.storage.service.impl;
+package com.huaxing.iot.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.dolphindb.base.CommonService;
-import com.huaxing.common.util.JacksonUtil;
+import com.huaxing.iot.data.storage.domain.DataAnalysisDTO;
+import com.huaxing.iot.data.storage.mapper.IDeviceDataStoredMapper;
+import com.huaxing.iot.data.storage.service.IDeviceDataStoredService;
+import com.huaxing.iot.dolphindb.base.CommonService;
+import com.huaxing.iot.common.util.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/abstracts/SqlConverterStatement.java

@@ -1,4 +1,4 @@
-package com.huaxing.dolphindb.abstracts;
+package com.huaxing.iot.dolphindb.abstracts;
 
 import java.util.Map;
 

data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/base/CommonService.java

@@ -1,7 +1,6 @@
-package com.huaxing.dolphindb.base;
+package com.huaxing.iot.dolphindb.base;
 
-import com.huaxing.common.result.ResultVo;
-import com.huaxing.dolphindb.connection.AbstractDbConnector;
+import com.huaxing.iot.dolphindb.connection.AbstractDbConnector;
 import com.xxdb.DBConnection;
 import com.xxdb.data.BasicBoolean;
 import com.xxdb.data.Entity;

data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/base/SqlConverterStatementHandle.java

@@ -1,6 +1,6 @@
-package com.huaxing.dolphindb.base;
+package com.huaxing.iot.dolphindb.base;
 
-import com.huaxing.dolphindb.abstracts.SqlConverterStatement;
+import com.huaxing.iot.dolphindb.abstracts.SqlConverterStatement;
 
 import java.util.List;
 import java.util.Map;

data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/config/DolphinDbConfiguration.java

@@ -1,4 +1,4 @@
-package com.huaxing.dolphindb.config;
+package com.huaxing.iot.dolphindb.config;
 
 import com.xxdb.*;
 import lombok.Getter;

data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/config/DolphinDbPoolConfiguration.java

@@ -1,4 +1,4 @@
-package com.huaxing.dolphindb.config;
+package com.huaxing.iot.dolphindb.config;
 
 import com.xxdb.*;
 import lombok.extern.slf4j.Slf4j;

data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/connection/AbstractDbConnector.java

@@ -1,4 +1,4 @@
-package com.huaxing.dolphindb.connection;
+package com.huaxing.iot.dolphindb.connection;
 
 import com.xxdb.DBConnection;
 import lombok.experimental.Accessors;

data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java → data-storage/src/main/java/com/huaxing/iot/dolphindb/connection/DbConnectorHelper.java

@@ -1,7 +1,7 @@
-package com.huaxing.dolphindb.connection;
+package com.huaxing.iot.dolphindb.connection;
 
-import com.huaxing.dolphindb.config.DolphinDbConfiguration;
-import com.huaxing.dolphindb.config.DolphinDbPoolConfiguration;
+import com.huaxing.iot.dolphindb.config.DolphinDbConfiguration;
+import com.huaxing.iot.dolphindb.config.DolphinDbPoolConfiguration;
 import com.xxdb.DBConnection;
 import org.springframework.stereotype.Component;
 

data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java → data-storage/src/main/java/com/huaxing/iot/mqtt/MqttMessageConsumer.java

@@ -1,7 +1,7 @@
-package com.huaxing.mqtt;
+package com.huaxing.iot.mqtt;
 
-import com.huaxing.data.storage.service.IDataAnalysisService;
-import com.huaxing.mqtt.processor.MqttMessageReceiver;
+import com.huaxing.iot.data.storage.service.IDataAnalysisService;
+import com.huaxing.iot.mqtt.processor.MqttMessageReceiver;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.integration.mqtt.support.MqttHeaders;

data-storage/src/main/java/com/huaxing/test/TestController.java → data-storage/src/main/java/com/huaxing/iot/test/TestController.java

@@ -1,4 +1,4 @@
-package com.huaxing.test;
+package com.huaxing.iot.test;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;

data-storage/src/main/resources/application-dev.yaml

@@ -10,6 +10,7 @@ spring:
   main:
     lazy-initialization: false
 
+
 mybatis:
   mapper-locations: classpath:com/huaxing/**/mapper/*.xml
   type-aliases-package: com.huaxing.**.entity
@@ -41,5 +42,5 @@ dolphindb:
   username: admin
   password: 123456
   init-pool-size: 10
-  minimum-pool-size: 5
+  minimum-pool-size: true
   enable-high-availability: false

data-storage/src/main/resources/application-uat.yaml

@@ -0,0 +1,46 @@
+spring:
+  application:
+    name: iot-data-bridge
+    version: 1.0.0
+  datasource:
+    url: jdbc:dolphindb://localhost:8848?databasePath=dfs://ZbDB
+    username: admin
+    password: 123456
+    driver-class-name: com.dolphindb.jdbc.Driver
+  main:
+    lazy-initialization: false
+
+
+mybatis:
+  mapper-locations: classpath:com/huaxing/**/mapper/*.xml
+  type-aliases-package: com.huaxing.**.entity
+  configuration:
+    map-underscore-to-camel-case: true
+  sql-session-factory:
+    data-source: ${spring.datasource}
+  sql-session-template:
+    executor-type: BATCH
+    sql-session-factory-ref: sqlSessionFactory
+
+mqtt:
+  username: admin
+  password: 123456
+  host-url: tcp://8.130.65.74:1883
+  client-id: iot
+  timeout: 100
+  keepalive: 100
+  completion-timeout: 5000
+  qos: 1
+  default-topic: iot/data/#
+  topics:
+    - iot/test1/#
+    - iot/test2/#
+
+dolphindb:
+  host: 127.0.0.1
+  port: 8848
+  username: admin
+  password: 123456
+  init-pool-size: 10
+  minimum-pool-size: true
+  enable-high-availability: false

data-storage/src/main/resources/application.yaml

@@ -5,3 +5,7 @@ server:
 spring:
   profiles:
     active: dev
+
+feign:
+  hystrix:
+    enabled: true

data-storage/src/main/resources/mapper/DeviceDataStoredStream.xml

@@ -1,6 +1,6 @@
 <!--<?xml version="1.0" encoding="UTF-8" ?>-->
 <!--<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">-->
-<!--<mapper namespace="com.huaxing.data.storage.mapper.IDeviceDataStoredMapper">-->
+<!--<mapper namespace="com.huaxing.iot.mapper.storage.data.IDeviceDataStoredMapper">-->
 
 <!--    <select id="selectList"  resultType="map">-->
 <!--     ${selectSql}-->

pom.xml

@@ -3,13 +3,20 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.huaxing</groupId>
+    <groupId>com.huaxing.iot</groupId>
     <artifactId>data-bridge</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
     <name>data-bridge</name>
     <description>data-bridge</description>
 
+    <!-- 设置 Java 源版本和目标版本为 1.8 -->
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <modules>
         <module>data-framework</module>
         <module>data-storage</module>
@@ -17,8 +24,6 @@
     </modules>
 
     <dependencies>
-
-
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
@@ -28,7 +33,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>RELEASE</version>
+            <version>1.18.30</version> <!-- 明确指定兼容 Java 8 的版本 -->
             <scope>provided</scope>
         </dependency>
         <!--mybatis的开发包-->
@@ -40,7 +45,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
-            <version>3.0.4</version>
+            <version>2.1.2</version>
         </dependency>
 
         <dependency>
@@ -49,75 +54,86 @@
             <version>2.3.2</version>
         </dependency>
 
+        <!-- 选择兼容 Java 8 的 Spring Boot 版本 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
-            <version>3.4.1</version>
+            <version>2.2.13.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>3.4.1</version>
+            <version>2.2.13.RELEASE</version>
         </dependency>
-        <dependency>
+
+        <!-- 移除重复依赖，保留一个版本 -->
+        <!-- <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
             <version>3.5.17</version>
-        </dependency>
+        </dependency> -->
 
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
-            <version>3.0.4</version>
+            <version>2.1.2</version>
             <scope>compile</scope>
         </dependency>
-        <!--dolphindb 相关-->
+
+
+        <!-- SLF4J API -->
         <dependency>
-            <groupId>com.dolphindb</groupId>
-            <artifactId>jdbc</artifactId>
-            <version>3.00.0.1</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version> <!-- 使用 1.7.x 版本 -->
+        </dependency>
+        <!-- Logback 实现 -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.11</version> <!-- 使用兼容 Java 8 的版本 -->
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.dolphindb/dolphindb-javaapi -->
+
+        <!-- 检查 jackson-databind 版本是否兼容 Java 1.8 -->
         <dependency>
-            <groupId>com.dolphindb</groupId>
-            <artifactId>dolphindb-javaapi</artifactId>
-            <version>3.00.2.3</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.11.4</version> <!-- 选择兼容 Java 1.8 的版本 -->
+        </dependency>
+
+
+        <!-- 日志 -->
+        <!-- <dependency>
+            <groupId> org.apache.cassandra</groupId>
+            <artifactId>cassandra-all</artifactId>
+            <version>0.8.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency> -->
 
-        <!-- 日志 -->
-<!--        <dependency>-->
-<!--            <groupId> org.apache.cassandra</groupId>-->
-<!--            <artifactId>cassandra-all</artifactId>-->
-<!--            <version>0.8.1</version>-->
-
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.slf4j</groupId>-->
-<!--                    <artifactId>slf4j-log4j12</artifactId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <groupId>log4j</groupId>-->
-<!--                    <artifactId>log4j</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-mqtt</artifactId>
-            <version>6.4.1</version>
-        </dependency>
     </dependencies>
 
-
     <build>
         <plugins>
+            <!-- 显式配置 maven-compiler-plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -125,7 +141,4 @@
             </plugin>
         </plugins>
     </build>
-
-
-
 </project>