From 5ac1ef17a38fb001f9938551a4f35856c90bbca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=91=AB?= <1173628408@qq.com> Date: Mon, 7 Oct 2024 18:36:05 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E9=87=8D=E6=96=B0=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-saas/pom.xml | 18 ++-- .../cloud-modules-data-process-server/pom.xml | 8 +- .../{IotDBConfig.java => IoTDBConfig.java} | 0 .../enterpise-cache/.gitignore | 38 ++++++++ .../enterpise-cache/pom.xml | 95 +++++++++++++++++++ .../cache/MessageValueCacheService.java | 0 .../enterpise/cache/SysCarCacheService.java | 0 .../cache/SysCarTypeCacheService.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 3 + .../enterpise-common/pom.xml | 5 + .../java/com/muyu/domain/SysCarFault.java | 1 + .../com/muyu/domain/req/FaultCodeListReq.java | 3 + .../enterpise-service/pom.xml | 3 +- cloud-modules/cloud-modules-parse/pom.xml | 5 +- .../com/muyu/parse/process/ProcessData.java | 2 - pom.xml | 20 +++- 16 files changed, 179 insertions(+), 22 deletions(-) rename cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/config/{IotDBConfig.java => IoTDBConfig.java} (100%) create mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/.gitignore create mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml rename cloud-modules/cloud-modules-enterprise/{enterprise-cache => enterpise-cache}/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java (100%) rename cloud-modules/cloud-modules-enterprise/{enterprise-cache => enterpise-cache}/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java (100%) rename cloud-modules/cloud-modules-enterprise/{enterprise-cache => enterpise-cache}/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java (100%) create mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cloud-common/cloud-common-saas/pom.xml b/cloud-common/cloud-common-saas/pom.xml index d2df2c4..60b4041 100644 --- a/cloud-common/cloud-common-saas/pom.xml +++ b/cloud-common/cloud-common-saas/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - cloud-modules-enterprise + cloud-common 3.6.3 - enterprise-cache + cloud-common-saas 17 @@ -18,22 +18,16 @@ + com.muyu - enterpise-common - ${muyu.version} + cloud-common-datasource + com.muyu - cloud-common-cache - ${muyu.version} - - - com.muyu - cloud-modules-vehicle-gateway - ${muyu.version} - + cloud-common-security diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml index 0703283..6078383 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml @@ -23,9 +23,15 @@ + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + + com.muyu - enterprise-cache + enterpise-cache com.muyu diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/config/IotDBConfig.java b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/config/IoTDBConfig.java similarity index 100% rename from cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/config/IotDBConfig.java rename to cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/config/IoTDBConfig.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-cache/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml new file mode 100644 index 0000000..5df41ff --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + enterpise-cache + + + 17 + 17 + UTF-8 + + + + + + com.muyu + enterpise-common + ${muyu.version} + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + com.muyu + cloud-common-cache + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + + com.muyu + cloud-common-xxl + + + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1681f6f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.muyu.enterpise.cache.MessageValueCacheService +com.muyu.enterpise.cache.SysCarCacheService +com.muyu.enterpise.cache.SysCarTypeCacheService diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml index 8d98d66..9bb9136 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml @@ -46,5 +46,10 @@ cloud-common-system + + com.muyu + cloud-common-saas + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java index 78a0987..8960c69 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-09-18 */ +@EqualsAndHashCode(callSuper = true) @Data @Setter @Getter diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java index b14c797..7ce0e7e 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -41,11 +42,13 @@ public class FaultCodeListReq { * 页码，从1开始 */ @Schema(name = "页码") + @Builder.Default private Integer pageNum=1; /** * 每页大小 */ @Schema(name = "每页大小") + @Builder.Default private Integer pageSize=10; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index 9901086..d7434f8 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -93,8 +93,7 @@ com.muyu - enterprise-cache - ${muyu.version} + enterpise-cache diff --git a/cloud-modules/cloud-modules-parse/pom.xml b/cloud-modules/cloud-modules-parse/pom.xml index 91a2e59..64e012c 100644 --- a/cloud-modules/cloud-modules-parse/pom.xml +++ b/cloud-modules/cloud-modules-parse/pom.xml @@ -93,19 +93,16 @@ com.muyu enterpise-remote - ${muyu.version} com.muyu enterpise-common - ${muyu.version} com.muyu - enterprise-cache - ${muyu.version} + enterpise-cache diff --git a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java index 609bd17..1dffc68 100644 --- a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java +++ b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java @@ -11,9 +11,7 @@ import com.muyu.enterpise.cache.SysCarTypeCacheService; import com.muyu.parse.uitl.DataParseUtil; import com.muyu.remote.RemoteMessageValueService; import lombok.extern.log4j.Log4j2; -import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.clients.producer.RecordMetadata; import javax.annotation.Resource; import java.util.List; diff --git a/pom.xml b/pom.xml index 879e258..d593d09 100644 --- a/pom.xml +++ b/pom.xml @@ -340,7 +340,25 @@ com.muyu - enterprise-cache + enterpise-cache + ${muyu.version} + + + + com.muyu + enterpise-common + ${muyu.version} + + + + com.muyu + enterpise-remote + ${muyu.version} + + + + com.muyu + cloud-common-saas ${muyu.version}