diff --git a/data-framework/pom.xml b/data-framework/pom.xml index 1217d55..78bc239 100644 --- a/data-framework/pom.xml +++ b/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"> 4.0.0 - com.huaxing + com.huaxing.iot data-bridge 1.0.0 data-framework framework + + + + 1.8 + 1.8 + + org.springframework spring-beans - 6.2.1 + 5.3.20 io.swagger.core.v3 @@ -25,8 +32,28 @@ org.springframework spring-context - 6.2.1 + 5.3.20 + + + org.springframework + spring-core + 5.3.20 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + \ No newline at end of file diff --git a/data-framework/src/main/java/com/huaxing/common/constant/AppConstant.java b/data-framework/src/main/java/com/huaxing/iot/common/constant/AppConstant.java similarity index 93% rename from data-framework/src/main/java/com/huaxing/common/constant/AppConstant.java rename to data-framework/src/main/java/com/huaxing/iot/common/constant/AppConstant.java index ecbfde2..e2daa20 100644 --- a/data-framework/src/main/java/com/huaxing/common/constant/AppConstant.java +++ b/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 diff --git a/data-framework/src/main/java/com/huaxing/common/constant/MqttConstant.java b/data-framework/src/main/java/com/huaxing/iot/common/constant/MqttConstant.java similarity index 87% rename from data-framework/src/main/java/com/huaxing/common/constant/MqttConstant.java rename to data-framework/src/main/java/com/huaxing/iot/common/constant/MqttConstant.java index eba93f5..21734c9 100644 --- a/data-framework/src/main/java/com/huaxing/common/constant/MqttConstant.java +++ b/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; /** * 常量 */ diff --git a/data-framework/src/main/java/com/huaxing/common/exception/BaseException.java b/data-framework/src/main/java/com/huaxing/iot/common/exception/BaseException.java similarity index 92% rename from data-framework/src/main/java/com/huaxing/common/exception/BaseException.java rename to data-framework/src/main/java/com/huaxing/iot/common/exception/BaseException.java index f970671..1047ed8 100644 --- a/data-framework/src/main/java/com/huaxing/common/exception/BaseException.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/common/exception/BizException.java b/data-framework/src/main/java/com/huaxing/iot/common/exception/BizException.java similarity index 86% rename from data-framework/src/main/java/com/huaxing/common/exception/BizException.java rename to data-framework/src/main/java/com/huaxing/iot/common/exception/BizException.java index 07af54f..1f89071 100644 --- a/data-framework/src/main/java/com/huaxing/common/exception/BizException.java +++ b/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 { diff --git a/data-framework/src/main/java/com/huaxing/common/result/ResultVo.java b/data-framework/src/main/java/com/huaxing/iot/common/result/ResultVo.java similarity index 91% rename from data-framework/src/main/java/com/huaxing/common/result/ResultVo.java rename to data-framework/src/main/java/com/huaxing/iot/common/result/ResultVo.java index 2c7f8b3..92d32ae 100644 --- a/data-framework/src/main/java/com/huaxing/common/result/ResultVo.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/common/util/JacksonUtil.java b/data-framework/src/main/java/com/huaxing/iot/common/util/JacksonUtil.java similarity index 98% rename from data-framework/src/main/java/com/huaxing/common/util/JacksonUtil.java rename to data-framework/src/main/java/com/huaxing/iot/common/util/JacksonUtil.java index 39f8742..4cbf146 100644 --- a/data-framework/src/main/java/com/huaxing/common/util/JacksonUtil.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/common/util/StrUtils.java b/data-framework/src/main/java/com/huaxing/iot/common/util/StrUtils.java similarity index 93% rename from data-framework/src/main/java/com/huaxing/common/util/StrUtils.java rename to data-framework/src/main/java/com/huaxing/iot/common/util/StrUtils.java index 5738737..ea5b930 100644 --- a/data-framework/src/main/java/com/huaxing/common/util/StrUtils.java +++ b/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 diff --git a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttConfiguration.java b/data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttConfiguration.java similarity index 97% rename from data-framework/src/main/java/com/huaxing/mqtt/config/MqttConfiguration.java rename to data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttConfiguration.java index fb12312..a65d9fb 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttConfiguration.java +++ b/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 { /** diff --git a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttConsumerConfiguration.java b/data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttConsumerConfiguration.java similarity index 95% rename from data-framework/src/main/java/com/huaxing/mqtt/config/MqttConsumerConfiguration.java rename to data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttConsumerConfiguration.java index 65311e6..d1d7494 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttConsumerConfiguration.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java b/data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttProducerConfiguration.java similarity index 96% rename from data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java rename to data-framework/src/main/java/com/huaxing/iot/mqtt/config/MqttProducerConfiguration.java index 0e91477..4562d46 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/config/MqttProducerConfiguration.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/mqtt/processor/MqttGateway.java b/data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttGateway.java similarity index 97% rename from data-framework/src/main/java/com/huaxing/mqtt/processor/MqttGateway.java rename to data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttGateway.java index 89c4fa2..68bf120 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/processor/MqttGateway.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageReceiver.java b/data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttMessageReceiver.java similarity index 87% rename from data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageReceiver.java rename to data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttMessageReceiver.java index 192febf..27fc164 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageReceiver.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageSender.java b/data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttMessageSender.java similarity index 96% rename from data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageSender.java rename to data-framework/src/main/java/com/huaxing/iot/mqtt/processor/MqttMessageSender.java index 27cc2f8..24bf8a5 100644 --- a/data-framework/src/main/java/com/huaxing/mqtt/processor/MqttMessageSender.java +++ b/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; diff --git a/data-storage-api/pom.xml b/data-storage-api/pom.xml index cf583ab..88136a0 100644 --- a/data-storage-api/pom.xml +++ b/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"> 4.0.0 - com.huaxing + com.huaxing.iot data-bridge 1.0.0 @@ -13,10 +13,11 @@ jar - 17 - 17 + 1.8 + 1.8 UTF-8 + com.huaxing @@ -31,11 +32,13 @@ 2.2.9.RELEASE + org.springframework.cloud spring-cloud-context - 3.1.4 + 2.2.9.RELEASE + jakarta.validation jakarta.validation-api @@ -43,4 +46,17 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + \ No newline at end of file diff --git a/data-storage-api/src/main/java/com/huaxing/feign/IDatabaseClientFeign.java b/data-storage-api/src/main/java/com/huaxing/iot/feign/IDatabaseClientFeign.java similarity index 91% rename from data-storage-api/src/main/java/com/huaxing/feign/IDatabaseClientFeign.java rename to data-storage-api/src/main/java/com/huaxing/iot/feign/IDatabaseClientFeign.java index b825ee4..c14629d 100644 --- a/data-storage-api/src/main/java/com/huaxing/feign/IDatabaseClientFeign.java +++ b/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; diff --git a/data-storage-api/src/main/java/com/huaxing/feign/fallback/DatabaseFeignFallbackFactory.java b/data-storage-api/src/main/java/com/huaxing/iot/feign/fallback/DatabaseFeignFallbackFactory.java similarity index 94% rename from data-storage-api/src/main/java/com/huaxing/feign/fallback/DatabaseFeignFallbackFactory.java rename to data-storage-api/src/main/java/com/huaxing/iot/feign/fallback/DatabaseFeignFallbackFactory.java index 65f6da6..66cd5b7 100644 --- a/data-storage-api/src/main/java/com/huaxing/feign/fallback/DatabaseFeignFallbackFactory.java +++ b/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; diff --git a/data-storage-api/src/main/java/com/huaxing/pojo/dto/DataQueryDTO.java b/data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/DataQueryDTO.java similarity index 93% rename from data-storage-api/src/main/java/com/huaxing/pojo/dto/DataQueryDTO.java rename to data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/DataQueryDTO.java index 3c08bf6..cae3e3a 100644 --- a/data-storage-api/src/main/java/com/huaxing/pojo/dto/DataQueryDTO.java +++ b/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; diff --git a/data-storage-api/src/main/java/com/huaxing/pojo/dto/DatabaseDTO.java b/data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/DatabaseDTO.java similarity index 94% rename from data-storage-api/src/main/java/com/huaxing/pojo/dto/DatabaseDTO.java rename to data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/DatabaseDTO.java index f0f22f1..2700e15 100644 --- a/data-storage-api/src/main/java/com/huaxing/pojo/dto/DatabaseDTO.java +++ b/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; diff --git a/data-storage-api/src/main/java/com/huaxing/pojo/dto/TableColumnDTO.java b/data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/TableColumnDTO.java similarity index 95% rename from data-storage-api/src/main/java/com/huaxing/pojo/dto/TableColumnDTO.java rename to data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/TableColumnDTO.java index a4deb8b..a509ce5 100644 --- a/data-storage-api/src/main/java/com/huaxing/pojo/dto/TableColumnDTO.java +++ b/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; diff --git a/data-storage-api/src/main/java/com/huaxing/pojo/dto/TableDTO.java b/data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/TableDTO.java similarity index 98% rename from data-storage-api/src/main/java/com/huaxing/pojo/dto/TableDTO.java rename to data-storage-api/src/main/java/com/huaxing/iot/pojo/dto/TableDTO.java index 232761c..60d801f 100644 --- a/data-storage-api/src/main/java/com/huaxing/pojo/dto/TableDTO.java +++ b/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; diff --git a/data-storage/pom.xml b/data-storage/pom.xml index 6e3093e..97bab60 100644 --- a/data-storage/pom.xml +++ b/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"> 4.0.0 - com.huaxing + com.huaxing.iot data-bridge 1.0.0 @@ -12,8 +12,15 @@ data-storage jar + + + 1.8 + 1.8 + UTF-8 + + - + com.huaxing data-framework @@ -23,53 +30,47 @@ org.springframework.boot spring-boot-starter - 3.4.1 + 2.2.6.RELEASE - + com.baomidou mybatis-plus-core - 3.5.8 + 3.3.2 + org.aspectj aspectjweaver 1.9.22.1 - - com.fasterxml.jackson.core - jackson-databind - 2.18.2 - org.springframework spring-web - 6.2.1 + 5.3.20 + org.springframework.cloud spring-cloud-starter-openfeign 2.2.9.RELEASE - - com.huaxing - data-storage-api - 0.0.1-SNAPSHOT - compile - + jakarta.validation jakarta.validation-api 2.0.2 + org.projectlombok lombok 1.18.30 provided + com.huaxing data-storage-api @@ -78,20 +79,99 @@ + + + com.dolphindb + jdbc + 3.00.0.1 + + + + com.dolphindb + dolphindb-javaapi + 3.00.2.3 + + + org.slf4j + slf4j-simple + + + + + + + + org.springframework.integration + spring-integration-mqtt + 5.3.10.RELEASE + + + + + + org.mybatis + mybatis + 3.5.5 + + + org.mybatis + mybatis-spring + 2.1.2 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.3.2 + + + + + org.springframework.boot + spring-boot-starter-jdbc + 2.2.13.RELEASE + + + org.springframework.boot + spring-boot-starter-web + 2.2.13.RELEASE + + + + org.mybatis + mybatis-spring + 2.1.2 + compile + + + + org.springframework.cloud spring-cloud-dependencies - 2021.0.5 + Hoxton.SR12 pom import - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + \ No newline at end of file diff --git a/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java b/data-storage/src/main/java/com/huaxing/iot/IotDataBridgeApplication.java similarity index 79% rename from data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java rename to data-storage/src/main/java/com/huaxing/iot/IotDataBridgeApplication.java index 0c56ad7..34c5b29 100644 --- a/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java +++ b/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) { diff --git a/data-storage/src/main/java/com/huaxing/TestDBConnection.java b/data-storage/src/main/java/com/huaxing/iot/TestDBConnection.java similarity index 100% rename from data-storage/src/main/java/com/huaxing/TestDBConnection.java rename to data-storage/src/main/java/com/huaxing/iot/TestDBConnection.java diff --git a/data-storage/src/main/java/com/huaxing/data/api/controller/DataQueryController.java b/data-storage/src/main/java/com/huaxing/iot/data/api/controller/DataQueryController.java similarity index 83% rename from data-storage/src/main/java/com/huaxing/data/api/controller/DataQueryController.java rename to data-storage/src/main/java/com/huaxing/iot/data/api/controller/DataQueryController.java index 67321e3..8f8c3a0 100644 --- a/data-storage/src/main/java/com/huaxing/data/api/controller/DataQueryController.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/database/controller/DatabaseController.java b/data-storage/src/main/java/com/huaxing/iot/data/database/controller/DatabaseController.java similarity index 91% rename from data-storage/src/main/java/com/huaxing/data/database/controller/DatabaseController.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/controller/DatabaseController.java index 4bc9837..ca87a24 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/controller/DatabaseController.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/database/service/IDatabaseService.java b/data-storage/src/main/java/com/huaxing/iot/data/database/service/IDatabaseService.java similarity index 66% rename from data-storage/src/main/java/com/huaxing/data/database/service/IDatabaseService.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/service/IDatabaseService.java index 2564102..d2c7e0c 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/service/IDatabaseService.java +++ b/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; /** * 数据库操作 diff --git a/data-storage/src/main/java/com/huaxing/data/database/service/ITableStructureService.java b/data-storage/src/main/java/com/huaxing/iot/data/database/service/ITableStructureService.java similarity index 89% rename from data-storage/src/main/java/com/huaxing/data/database/service/ITableStructureService.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/service/ITableStructureService.java index af8486c..49a530b 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/service/ITableStructureService.java +++ b/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 diff --git a/data-storage/src/main/java/com/huaxing/data/database/service/impl/DatabaseServiceImpl.java b/data-storage/src/main/java/com/huaxing/iot/data/database/service/impl/DatabaseServiceImpl.java similarity index 80% rename from data-storage/src/main/java/com/huaxing/data/database/service/impl/DatabaseServiceImpl.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/service/impl/DatabaseServiceImpl.java index 3530932..a4fd544 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/service/impl/DatabaseServiceImpl.java +++ b/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 */ diff --git a/data-storage/src/main/java/com/huaxing/data/database/service/impl/TableStructureService.java b/data-storage/src/main/java/com/huaxing/iot/data/database/service/impl/TableStructureService.java similarity index 94% rename from data-storage/src/main/java/com/huaxing/data/database/service/impl/TableStructureService.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/service/impl/TableStructureService.java index 38d1669..d32c3b3 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/service/impl/TableStructureService.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/database/template/ISqlTemplateService.java b/data-storage/src/main/java/com/huaxing/iot/data/database/template/ISqlTemplateService.java similarity index 92% rename from data-storage/src/main/java/com/huaxing/data/database/template/ISqlTemplateService.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/template/ISqlTemplateService.java index ac7898e..42f1d35 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/template/ISqlTemplateService.java +++ b/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; /** * 表创建模板 diff --git a/data-storage/src/main/java/com/huaxing/data/database/template/SqlTemplateServiceImpl.java b/data-storage/src/main/java/com/huaxing/iot/data/database/template/SqlTemplateServiceImpl.java similarity index 98% rename from data-storage/src/main/java/com/huaxing/data/database/template/SqlTemplateServiceImpl.java rename to data-storage/src/main/java/com/huaxing/iot/data/database/template/SqlTemplateServiceImpl.java index 593d7d3..ee6b2bd 100644 --- a/data-storage/src/main/java/com/huaxing/data/database/template/SqlTemplateServiceImpl.java +++ b/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; /** diff --git a/data-storage/src/main/java/com/huaxing/data/storage/domain/DataAnalysisDTO.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/domain/DataAnalysisDTO.java similarity index 93% rename from data-storage/src/main/java/com/huaxing/data/storage/domain/DataAnalysisDTO.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/domain/DataAnalysisDTO.java index 59cf0a5..07b1289 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/domain/DataAnalysisDTO.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryDfsMapper.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataQueryDfsMapper.java similarity index 90% rename from data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryDfsMapper.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataQueryDfsMapper.java index b150bca..ee79b14 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryDfsMapper.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryStreamMapper.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataQueryStreamMapper.java similarity index 90% rename from data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryStreamMapper.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataQueryStreamMapper.java index 8cba124..d2ec550 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataQueryStreamMapper.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataStoredMapper.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataStoredMapper.java similarity index 88% rename from data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataStoredMapper.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/mapper/IDeviceDataStoredMapper.java index f1f7b82..41994ec 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/mapper/IDeviceDataStoredMapper.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/IDataAnalysisService.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDataAnalysisService.java similarity index 80% rename from data-storage/src/main/java/com/huaxing/data/storage/service/IDataAnalysisService.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDataAnalysisService.java index bd099b2..9af28d6 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/IDataAnalysisService.java +++ b/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; /** * 入库数据解析服务 diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryDfsService.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataQueryDfsService.java similarity index 85% rename from data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryDfsService.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataQueryDfsService.java index 20dbe11..6a59d5d 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryDfsService.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryStreamService.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataQueryStreamService.java similarity index 86% rename from data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryStreamService.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataQueryStreamService.java index 232bf24..c542f07 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataQueryStreamService.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataStoredService.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataStoredService.java similarity index 73% rename from data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataStoredService.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/IDeviceDataStoredService.java index 387056e..c01143d 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/IDeviceDataStoredService.java +++ b/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 diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DataAnalysisService.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DataAnalysisService.java similarity index 78% rename from data-storage/src/main/java/com/huaxing/data/storage/service/impl/DataAnalysisService.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DataAnalysisService.java index 9509643..8bedf07 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DataAnalysisService.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java similarity index 84% rename from data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java index 0df8687..6c8a5b4 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryDfsServiceImpl.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java similarity index 84% rename from data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java index 93cb09c..6909d1f 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataQueryStreamServiceImpl.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java b/data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataStoredServiceImpl.java similarity index 76% rename from data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java rename to data-storage/src/main/java/com/huaxing/iot/data/storage/service/impl/DeviceDataStoredServiceImpl.java index 0a68e5c..b0bb0cb 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/abstracts/SqlConverterStatement.java similarity index 91% rename from data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/abstracts/SqlConverterStatement.java index b22c9eb..8bdcc94 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/abstracts/SqlConverterStatement.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/base/CommonService.java similarity index 94% rename from data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/base/CommonService.java index 3306798..bd1cf0d 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/base/CommonService.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/base/SqlConverterStatementHandle.java similarity index 95% rename from data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/base/SqlConverterStatementHandle.java index fab7143..e253ebe 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/base/SqlConverterStatementHandle.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/config/DolphinDbConfiguration.java similarity index 97% rename from data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/config/DolphinDbConfiguration.java index fa1338f..84971ff 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbConfiguration.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/config/DolphinDbPoolConfiguration.java similarity index 94% rename from data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/config/DolphinDbPoolConfiguration.java index 4fe73f1..2cd499f 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/config/DolphinDbPoolConfiguration.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/connection/AbstractDbConnector.java similarity index 91% rename from data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/connection/AbstractDbConnector.java index 7718361..cb73266 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/connection/AbstractDbConnector.java +++ b/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; diff --git a/data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java b/data-storage/src/main/java/com/huaxing/iot/dolphindb/connection/DbConnectorHelper.java similarity index 83% rename from data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java rename to data-storage/src/main/java/com/huaxing/iot/dolphindb/connection/DbConnectorHelper.java index f731ef5..4f4de56 100644 --- a/data-framework/src/main/java/com/huaxing/dolphindb/connection/DbConnectorHelper.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java b/data-storage/src/main/java/com/huaxing/iot/mqtt/MqttMessageConsumer.java similarity index 93% rename from data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java rename to data-storage/src/main/java/com/huaxing/iot/mqtt/MqttMessageConsumer.java index a6dcd46..a7a569f 100644 --- a/data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java +++ b/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; diff --git a/data-storage/src/main/java/com/huaxing/test/TestController.java b/data-storage/src/main/java/com/huaxing/iot/test/TestController.java similarity index 99% rename from data-storage/src/main/java/com/huaxing/test/TestController.java rename to data-storage/src/main/java/com/huaxing/iot/test/TestController.java index 9555f7d..6352159 100644 --- a/data-storage/src/main/java/com/huaxing/test/TestController.java +++ b/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; diff --git a/data-storage/src/main/resources/application-dev.yaml b/data-storage/src/main/resources/application-dev.yaml index afcb30d..ae5e8c8 100644 --- a/data-storage/src/main/resources/application-dev.yaml +++ b/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 \ No newline at end of file diff --git a/data-storage/src/main/resources/application-uat.yaml b/data-storage/src/main/resources/application-uat.yaml new file mode 100644 index 0000000..ae5e8c8 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/data-storage/src/main/resources/application.yaml b/data-storage/src/main/resources/application.yaml index 10af456..91033c2 100644 --- a/data-storage/src/main/resources/application.yaml +++ b/data-storage/src/main/resources/application.yaml @@ -4,4 +4,8 @@ server: context-path: /api spring: profiles: - active: dev \ No newline at end of file + active: dev + +feign: + hystrix: + enabled: true \ No newline at end of file diff --git a/data-storage/src/main/resources/mapper/DeviceDataStoredStream.xml b/data-storage/src/main/resources/mapper/DeviceDataStoredStream.xml index 1d6785a..377daba 100644 --- a/data-storage/src/main/resources/mapper/DeviceDataStoredStream.xml +++ b/data-storage/src/main/resources/mapper/DeviceDataStoredStream.xml @@ -1,6 +1,6 @@ - + diff --git a/pom.xml b/pom.xml index c56b010..b7184f0 100644 --- a/pom.xml +++ b/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"> 4.0.0 - com.huaxing + com.huaxing.iot data-bridge 1.0.0 pom data-bridge data-bridge + + + 1.8 + 1.8 + UTF-8 + + data-framework data-storage @@ -17,8 +24,6 @@ - - org.json json @@ -28,7 +33,7 @@ org.projectlombok lombok - RELEASE + 1.18.30 provided @@ -40,7 +45,7 @@ org.mybatis mybatis-spring - 3.0.4 + 2.1.2 @@ -49,75 +54,86 @@ 2.3.2 + org.springframework.boot spring-boot-starter-jdbc - 3.4.1 + 2.2.13.RELEASE org.springframework.boot spring-boot-starter-web - 3.4.1 + 2.2.13.RELEASE - + + + org.mybatis mybatis-spring - 3.0.4 + 2.1.2 compile - + + + + + org.slf4j + slf4j-api + 1.7.36 + + - com.dolphindb - jdbc - 3.00.0.1 + ch.qos.logback + logback-classic + 1.2.11 - + + - com.dolphindb - dolphindb-javaapi - 3.00.2.3 + com.fasterxml.jackson.core + jackson-databind + 2.11.4 + + + + + - - - - - - - - - - - - - - - - - - - org.springframework.integration - spring-integration-mqtt - 6.4.1 - - + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + org.apache.maven.plugins maven-antrun-plugin @@ -125,7 +141,4 @@ - - - - + \ No newline at end of file