From 6594363a91752fb488e9c845cdf1caf6dc6236d7 Mon Sep 17 00:00:00 2001 From: xinzirun Date: Sun, 29 Sep 2024 16:06:24 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8Dcloud-data-process?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20--->=20cloud-event-process=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 4 ++-- .../event/process/CloudEventProcessApplication.java} | 8 ++++---- .../process/basic/config/IoTDBSessionConfig.java | 2 +- .../event}/process/basic/service/IoTDBService.java | 6 +++--- .../process/basic/service/impl/IoTDBServiceImpl.java | 10 +++++----- .../java/com/muyu/event}/process/domain/DataJSON.java | 2 +- .../com/muyu/event}/process/domain/ResultEntity.java | 4 ++-- .../com/muyu/event}/process/domain/TestDataType.java | 2 +- .../muyu/event}/process/domain/dto/InsertDataDTO.java | 2 +- .../event}/process/domain/dto/IoTDbRecordAble.java | 2 +- .../process/domain/dto/MeasurementSchemaValuesDTO.java | 2 +- .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/logback/dev.xml | 2 +- .../src/main/resources/logback/prod.xml | 2 +- .../src/main/resources/logback/test.xml | 2 +- cloud-modules/pom.xml | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) rename cloud-modules/{cloud-modules-data-process => cloud-modules-event-process}/pom.xml (96%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data/process/CloudDataProcessApplication.java => cloud-modules-event-process/src/main/java/com/muyu/event/process/CloudEventProcessApplication.java} (68%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/basic/config/IoTDBSessionConfig.java (98%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/basic/service/IoTDBService.java (98%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/basic/service/impl/IoTDBServiceImpl.java (99%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/domain/DataJSON.java (94%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/domain/ResultEntity.java (83%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/domain/TestDataType.java (94%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/domain/dto/InsertDataDTO.java (97%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/domain/dto/IoTDbRecordAble.java (78%) rename cloud-modules/{cloud-modules-data-process/src/main/java/com/muyu/data => cloud-modules-event-process/src/main/java/com/muyu/event}/process/domain/dto/MeasurementSchemaValuesDTO.java (95%) rename cloud-modules/{cloud-modules-data-process => cloud-modules-event-process}/src/main/resources/banner.txt (100%) rename cloud-modules/{cloud-modules-data-process => cloud-modules-event-process}/src/main/resources/bootstrap.yml (94%) rename cloud-modules/{cloud-modules-data-process => cloud-modules-event-process}/src/main/resources/logback/dev.xml (97%) rename cloud-modules/{cloud-modules-data-process => cloud-modules-event-process}/src/main/resources/logback/prod.xml (98%) rename cloud-modules/{cloud-modules-data-process => cloud-modules-event-process}/src/main/resources/logback/test.xml (98%) diff --git a/cloud-modules/cloud-modules-data-process/pom.xml b/cloud-modules/cloud-modules-event-process/pom.xml similarity index 96% rename from cloud-modules/cloud-modules-data-process/pom.xml rename to cloud-modules/cloud-modules-event-process/pom.xml index cb4a354..20a8257 100644 --- a/cloud-modules/cloud-modules-data-process/pom.xml +++ b/cloud-modules/cloud-modules-event-process/pom.xml @@ -9,7 +9,7 @@ 3.6.3 - cloud-modules-data-process + cloud-modules-event-process 17 @@ -18,7 +18,7 @@ - cloud-modules-data-process 数据处理 + cloud-modules-event-process 事件处理 diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/CloudDataProcessApplication.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/CloudEventProcessApplication.java similarity index 68% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/CloudDataProcessApplication.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/CloudEventProcessApplication.java index b5ba238..46b5858 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/CloudDataProcessApplication.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/CloudEventProcessApplication.java @@ -1,4 +1,4 @@ -package com.muyu.data.process; +package com.muyu.event.process; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; @@ -8,13 +8,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @Author: zi run * @Date 2024/9/28 22:31 - * @Description 数据处理微服启动类 + * @Description 事件处理微服启动类 */ @EnableCustomConfig @EnableMyFeignClients @SpringBootApplication -public class CloudDataProcessApplication { +public class CloudEventProcessApplication { public static void main(String[] args) { - SpringApplication.run(CloudDataProcessApplication.class, args); + SpringApplication.run(CloudEventProcessApplication.class, args); } } diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/config/IoTDBSessionConfig.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/config/IoTDBSessionConfig.java similarity index 98% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/config/IoTDBSessionConfig.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/config/IoTDBSessionConfig.java index 3bf7de1..01a498c 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/config/IoTDBSessionConfig.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/config/IoTDBSessionConfig.java @@ -1,4 +1,4 @@ -package com.muyu.data.process.basic.config; +package com.muyu.event.process.basic.config; import lombok.extern.slf4j.Slf4j; import org.apache.iotdb.session.pool.SessionPool; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/service/IoTDBService.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/service/IoTDBService.java similarity index 98% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/service/IoTDBService.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/service/IoTDBService.java index a869c69..5c4ac01 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/service/IoTDBService.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/service/IoTDBService.java @@ -1,7 +1,7 @@ -package com.muyu.data.process.basic.service; +package com.muyu.event.process.basic.service; -import com.muyu.data.process.domain.dto.IoTDbRecordAble; -import com.muyu.data.process.domain.dto.MeasurementSchemaValuesDTO; +import com.muyu.event.process.domain.dto.IoTDbRecordAble; +import com.muyu.event.process.domain.dto.MeasurementSchemaValuesDTO; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/service/impl/IoTDBServiceImpl.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/service/impl/IoTDBServiceImpl.java similarity index 99% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/service/impl/IoTDBServiceImpl.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/service/impl/IoTDBServiceImpl.java index fcbd374..73e67e2 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/basic/service/impl/IoTDBServiceImpl.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/basic/service/impl/IoTDBServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.data.process.basic.service.impl; +package com.muyu.event.process.basic.service.impl; import com.alibaba.fastjson.JSON; -import com.muyu.data.process.basic.config.IoTDBSessionConfig; -import com.muyu.data.process.basic.service.IoTDBService; -import com.muyu.data.process.domain.dto.IoTDbRecordAble; -import com.muyu.data.process.domain.dto.MeasurementSchemaValuesDTO; +import com.muyu.event.process.basic.config.IoTDBSessionConfig; +import com.muyu.event.process.basic.service.IoTDBService; +import com.muyu.event.process.domain.dto.IoTDbRecordAble; +import com.muyu.event.process.domain.dto.MeasurementSchemaValuesDTO; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/DataJSON.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/DataJSON.java similarity index 94% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/DataJSON.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/DataJSON.java index 86c075e..16853f3 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/DataJSON.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/DataJSON.java @@ -1,4 +1,4 @@ -package com.muyu.data.process.domain; +package com.muyu.event.process.domain; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/ResultEntity.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/ResultEntity.java similarity index 83% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/ResultEntity.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/ResultEntity.java index c8326d2..02d7d96 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/ResultEntity.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/ResultEntity.java @@ -1,6 +1,6 @@ -package com.muyu.data.process.domain; +package com.muyu.event.process.domain; -import com.muyu.data.process.domain.dto.IoTDbRecordAble; +import com.muyu.event.process.domain.dto.IoTDbRecordAble; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/TestDataType.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/TestDataType.java similarity index 94% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/TestDataType.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/TestDataType.java index 52d196c..dd75553 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/TestDataType.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/TestDataType.java @@ -1,4 +1,4 @@ -package com.muyu.data.process.domain; +package com.muyu.event.process.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/InsertDataDTO.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/InsertDataDTO.java similarity index 97% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/InsertDataDTO.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/InsertDataDTO.java index 1560ac6..d213bd8 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/InsertDataDTO.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/InsertDataDTO.java @@ -1,4 +1,4 @@ -package com.muyu.data.process.domain.dto; +package com.muyu.event.process.domain.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/IoTDbRecordAble.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/IoTDbRecordAble.java similarity index 78% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/IoTDbRecordAble.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/IoTDbRecordAble.java index 6525e38..957dfb5 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/IoTDbRecordAble.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/IoTDbRecordAble.java @@ -1,4 +1,4 @@ -package com.muyu.data.process.domain.dto; +package com.muyu.event.process.domain.dto; import lombok.Data; diff --git a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/MeasurementSchemaValuesDTO.java b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/MeasurementSchemaValuesDTO.java similarity index 95% rename from cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/MeasurementSchemaValuesDTO.java rename to cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/MeasurementSchemaValuesDTO.java index 3e025dc..8681f19 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/java/com/muyu/data/process/domain/dto/MeasurementSchemaValuesDTO.java +++ b/cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/domain/dto/MeasurementSchemaValuesDTO.java @@ -1,4 +1,4 @@ -package com.muyu.data.process.domain.dto; +package com.muyu.event.process.domain.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-data-process/src/main/resources/banner.txt b/cloud-modules/cloud-modules-event-process/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-modules-data-process/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-event-process/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-modules-data-process/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-event-process/src/main/resources/bootstrap.yml similarity index 94% rename from cloud-modules/cloud-modules-data-process/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-event-process/src/main/resources/bootstrap.yml index 39a6819..47bf553 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-event-process/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ nacos: spring: application: # 应用名称 - name: cloud-data-process + name: cloud-event-process profiles: # 环境配置 active: dev diff --git a/cloud-modules/cloud-modules-data-process/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-event-process/src/main/resources/logback/dev.xml similarity index 97% rename from cloud-modules/cloud-modules-data-process/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-event-process/src/main/resources/logback/dev.xml index 6a776b3..1e47ab3 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/resources/logback/dev.xml +++ b/cloud-modules/cloud-modules-event-process/src/main/resources/logback/dev.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-modules-data-process/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-event-process/src/main/resources/logback/prod.xml similarity index 98% rename from cloud-modules/cloud-modules-data-process/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-event-process/src/main/resources/logback/prod.xml index 839788c..d59fdeb 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/resources/logback/prod.xml +++ b/cloud-modules/cloud-modules-event-process/src/main/resources/logback/prod.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-modules-data-process/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-event-process/src/main/resources/logback/test.xml similarity index 98% rename from cloud-modules/cloud-modules-data-process/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-event-process/src/main/resources/logback/test.xml index 1ad1029..cb4420b 100644 --- a/cloud-modules/cloud-modules-data-process/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-modules-event-process/src/main/resources/logback/test.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index c104eeb..d877d6c 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -14,7 +14,7 @@ cloud-modules-file cloud-modules-enterprise cloud-weixin-mp - cloud-modules-data-process + cloud-modules-event-process cloud-modules