fix():重新构建数据处理结构

cloud-common/cloud-common-saas/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-enterprise</artifactId>
+        <artifactId>cloud-common</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>enterprise-cache</artifactId>
+    <artifactId>cloud-common-saas</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -18,22 +18,16 @@
     </properties>
 
     <dependencies>
+        <!-- 多数据源依赖 -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterpise-common</artifactId>
+            <artifactId>cloud-common-datasource</artifactId>
-            <version>${muyu.version}</version>
         </dependency>
 
+        <!-- 鉴权依赖 -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-cache</artifactId>
+            <artifactId>cloud-common-security</artifactId>
-            <version>${muyu.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-modules-vehicle-gateway</artifactId>
-            <version>${muyu.version}</version>
-
         </dependency>
     </dependencies>
 

cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml

@@ -23,9 +23,15 @@
 
     <dependencies>
 
+        <!--   mqtt监控者     -->
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterprise-cache</artifactId>
+            <artifactId>enterpise-cache</artifactId>
         </dependency>
         <dependency>
             <groupId>com.muyu</groupId>

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

cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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.muyu</groupId>
+        <artifactId>cloud-modules-enterprise</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>enterpise-cache</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>enterpise-common</artifactId>
+            <version>${muyu.version}</version>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataSource -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-datasource</artifactId>
+        </dependency>
+        <!-- 缓存公共模块  -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-cache</artifactId>
+        </dependency>
+
+        <!-- MuYu Common DataScope -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-datascope</artifactId>
+        </dependency>
+
+        <!-- MuYu Common Log -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-log</artifactId>
+        </dependency>
+
+        <!-- 接口模块 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-api-doc</artifactId>
+        </dependency>
+
+        <!-- XllJob定时任务 -->
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-xxl</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml

@@ -46,5 +46,10 @@
             <artifactId>cloud-common-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
+
     </dependencies>
 </project>

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

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;
 
 

cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml

@@ -93,8 +93,7 @@
         <!--    cache缓存框架    -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterprise-cache</artifactId>
+            <artifactId>enterpise-cache</artifactId>
-            <version>${muyu.version}</version>
         </dependency>
 
     </dependencies>

cloud-modules/cloud-modules-parse/pom.xml

@@ -93,19 +93,16 @@
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-remote</artifactId>
-            <version>${muyu.version}</version>
         </dependency>
             <!--  实体类      -->
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>enterpise-common</artifactId>
-            <version>${muyu.version}</version>
         </dependency>
             <!--      缓存框架          -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>enterprise-cache</artifactId>
+            <artifactId>enterpise-cache</artifactId>
-            <version>${muyu.version}</version>
         </dependency>
 
         <!--  kafka 公共配置      -->

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;

pom.xml

@@ -340,7 +340,25 @@
 
             <dependency>
                 <groupId>com.muyu</groupId>
-                <artifactId>enterprise-cache</artifactId>
+                <artifactId>enterpise-cache</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>enterpise-common</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>enterpise-remote</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>cloud-common-saas</artifactId>
                 <version>${muyu.version}</version>
             </dependency>
         </dependencies>