调整项目结构

2023-07-19 11:37:41 +08:00
parent 36c5394681
commit 1ba3474431
25 changed files with 610 additions and 49 deletions
--- a/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsGatewayDeviceMapper.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsGatewayDeviceMapper.java
@@ -2,8 +2,6 @@ package com.njcn.access.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.access.pojo.po.CsGatewayDevice;
-import com.njcn.access.pojo.vo.CsGatewayVo;
-import com.njcn.csdevice.pojo.po.CsEquipmentAlarmPO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;

 import java.util.List;
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsGatewayDeviceService.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsGatewayDeviceService.java
@@ -2,7 +2,6 @@ package com.njcn.access.service;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.access.pojo.po.CsGatewayDevice;
-import com.njcn.csdevice.pojo.po.CsEquipmentAlarmPO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;

 import java.util.List;
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
@@ -9,7 +9,6 @@ import com.njcn.access.param.DevAccessParam;
 import com.njcn.access.pojo.dto.AccessDto;
 import com.njcn.access.pojo.dto.ReqAndResDto;
 import com.njcn.access.service.ICsDeviceService;
-import com.njcn.access.service.ICsGatewayService;
 import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -22,7 +21,6 @@ import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.redis.utils.RedisUtil;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsGatewayDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsGatewayDeviceServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.mapper.CsGatewayDeviceMapper;
 import com.njcn.access.pojo.po.CsGatewayDevice;
 import com.njcn.access.service.ICsGatewayDeviceService;
-import com.njcn.csdevice.pojo.po.CsEquipmentAlarmPO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import org.springframework.stereotype.Service;

--- a/iot-access/access-boot/src/main/resources/bootstrap.yml
+++ b/iot-access/access-boot/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ microservice:
  sentinel:
    url: @sentinel.url@
  gateway:
-      url: @gateway.url@
+    url: @gateway.url@
 server:
  port: 10301
 #feign接口开启服务熔断降级处理
@@ -52,4 +52,4 @@ mybatis-plus:


 mqtt:
-  client-id: access-boot${random.value}
+  client-id: access-boot123456
--- a/iot-access/access-boot/src/test/java/com/njcn/AppTest.java
+++ b/iot-access/access-boot/src/test/java/com/njcn/AppTest.java
@@ -2,8 +2,27 @@ package com.njcn;

 import static org.junit.Assert.assertTrue;

+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.graphbuilder.math.func.EFunction;
+import com.njcn.access.pojo.dto.mqtt.MqttClientDto;
+import io.lettuce.core.protocol.CompleteableCommand;
+import okhttp3.Credentials;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import org.junit.Test;

+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+
 /**
 * Unit test for simple App.
 */
@@ -17,4 +36,31 @@ public class AppTest
    {
        assertTrue( true );
    }
+
+
+    public static void main(String[] args) {
+        try {
+            String username = "ac760c62395cecec";
+            String password = "k0vGfe5xOE2Bl4DCF73uahcknvcwoKOEDPnOkMvuSBB";
+
+            OkHttpClient client = new OkHttpClient();
+
+            Request request = new Request.Builder()
+                    .url("http://192.168.1.18:18083/api/v5/clients/access-boot123456")
+                    .header("Content-Type", "application/json")
+                    .header("Authorization", Credentials.basic(username, password))
+                    .build();
+
+            Response response = client.newCall(request).execute();
+            response.body();
+            String res = Objects.requireNonNull(response.body()).string();
+
+            Gson gson = new Gson();
+            MqttClientDto mqttClientDto = gson.fromJson(res, new TypeToken<MqttClientDto>(){}.getType());
+            System.out.println("mqttClientDto==:" + mqttClientDto.isConnected());
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
--- a/iot-analysis/analysis-api/pom.xml
+++ b/iot-analysis/analysis-api/pom.xml
@@ -1,7 +1,7 @@
 <?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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <parent>
    <artifactId>iot-analysis</artifactId>
    <groupId>com.njcn</groupId>
@@ -9,22 +9,20 @@
  </parent>
  <modelVersion>4.0.0</modelVersion>

-  <artifactId>analysis-api</artifactId>
+  <artifactId>analysis-rt</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>
+  <modules>
+    <module>rt-api</module>
+    <module>rt-boot</module>
+  </modules>

-  <name>analysis-api</name>
+  <name>analysis-rt</name>
+  <description>物解析-实时数据解析模块</description>

  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <maven.compiler.source>8</maven.compiler.source>
    <maven.compiler.target>8</maven.compiler.target>
  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 </project>
--- a/iot-analysis/analysis-rt/rt-api/pom.xml
+++ b/iot-analysis/analysis-rt/rt-api/pom.xml
@@ -0,0 +1,22 @@
+<?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">
+  <parent>
+    <artifactId>analysis-rt</artifactId>
+    <groupId>com.njcn</groupId>
+    <version>1.0.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>rt-api</artifactId>
+  <version>1.0.0</version>
+
+  <name>rt-api</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+</project>
--- a/iot-analysis/analysis-rt/rt-boot/pom.xml
+++ b/iot-analysis/analysis-rt/rt-boot/pom.xml
@@ -0,0 +1,109 @@
+<?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">
+  <parent>
+    <artifactId>analysis-rt</artifactId>
+    <groupId>com.njcn</groupId>
+    <version>1.0.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>rt-boot</artifactId>
+  <version>1.0.0</version>
+
+  <name>rt-boot</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-web</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-swagger</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.baomidou</groupId>
+      <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-db</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>rtboot</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <!--执行mvn package,即执行 mvn clean package docker:build-->
+          <execution>
+            <id>build-image</id>
+            <phase>${docker.operate}</phase>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!--<serverId>36dockerHarbor</serverId>-->
+          <registryUrl>http://${docker.repostory}</registryUrl>
+          <!-- 镜像名称 -->
+          <imageName>${docker.repostory}/${docker.registry.name}/${project.artifactId}</imageName>
+          <!-- 指定标签 -->
+          <imageTags>
+            <imageTag>latest</imageTag>
+          </imageTags>
+          <!-- 指定远程 Docker API地址  -->
+          <dockerHost>${docker.url}</dockerHost>
+          <dockerDirectory>${basedir}/</dockerDirectory>
+          <!-- 复制 jar包到docker容器指定目录-->
+          <resources>
+            <resource>
+              <targetPath>/ROOT</targetPath>
+              <!-- 用于指定需要复制的根目录，${project.build.directory}表示target目录 -->
+              <directory>${project.build.directory}</directory>
+              <!-- 用于指定需要复制的文件，${project.build.finalName}.jar就是打包后的target目录下的jar包名称　-->
+              <include>${project.build.finalName}.jar</include>
+            </resource>
+          </resources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
--- a/iot-analysis/analysis-boot/src/main/java/com/njcn/analysis/AnalysisBootApplication.java
+++ b/iot-analysis/analysis-boot/src/main/java/com/njcn/analysis/AnalysisBootApplication.java
@@ -1,4 +1,4 @@
-package com.njcn.analysis;
+package com.njcn.rt;

 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -16,10 +16,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@MapperScan("com.njcn.**.mapper")
@EnableFeignClients(basePackages = "com.njcn")
@SpringBootApplication(scanBasePackages = "com.njcn")
-public class AnalysisBootApplication {
+public class RtBootApplication {

    public static void main(String[] args)  {
-        SpringApplication.run(AnalysisBootApplication.class, args);
+        SpringApplication.run(RtBootApplication.class, args);
    }

 }
--- a/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml
+++ b/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ microservice:
  sentinel:
    url: @sentinel.url@
  gateway:
-      url:
+    url: @gateway.url@
 server:
  port: 10303
 #feign接口开启服务熔断降级处理
@@ -31,12 +31,11 @@ spring:
        shared-configs:
          - data-id: share-config.yaml
            refresh: true
-          - data-Id: share-config-datasource-db.yaml
+          - data-Id: algorithm-config.yaml
            refresh: true
  main:
    allow-bean-definition-overriding: true

-
 #项目日志的配置
 logging:
  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
@@ -47,8 +46,8 @@ logging:
 #mybatis配置信息
 mybatis-plus:
  #别名扫描
-  type-aliases-package: com.njcn.analysis.pojo
+  type-aliases-package: com.njcn.rt.pojo


 mqtt:
-  client-id: analysis-boot${random.value}
+  client-id: analysis-rt-boot${random.value}
--- a/iot-analysis/analysis-rt/rt-boot/src/test/java/com/njcn/AppTest.java
+++ b/iot-analysis/analysis-rt/rt-boot/src/test/java/com/njcn/AppTest.java
--- a/iot-analysis/analysis-stat/pom.xml
+++ b/iot-analysis/analysis-stat/pom.xml
@@ -0,0 +1,28 @@
+<?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">
+  <parent>
+    <artifactId>iot-analysis</artifactId>
+    <groupId>com.njcn</groupId>
+    <version>1.0.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>analysis-stat</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>
+  <modules>
+    <module>stat-api</module>
+    <module>stat-boot</module>
+  </modules>
+
+  <name>analysis-stat</name>
+  <description>物解析-统计数据解析模块</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+</project>
--- a/iot-analysis/analysis-stat/stat-api/pom.xml
+++ b/iot-analysis/analysis-stat/stat-api/pom.xml
@@ -0,0 +1,22 @@
+<?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">
+  <parent>
+    <artifactId>analysis-stat</artifactId>
+    <groupId>com.njcn</groupId>
+    <version>1.0.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>stat-api</artifactId>
+  <version>1.0.0</version>
+
+  <name>stat-api</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+</project>
--- a/iot-analysis/analysis-stat/stat-boot/pom.xml
+++ b/iot-analysis/analysis-stat/stat-boot/pom.xml
@@ -0,0 +1,109 @@
+<?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">
+  <parent>
+    <artifactId>analysis-stat</artifactId>
+    <groupId>com.njcn</groupId>
+    <version>1.0.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>stat-boot</artifactId>
+  <version>1.0.0</version>
+
+  <name>stat-boot</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-web</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-swagger</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.baomidou</groupId>
+      <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-db</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>statboot</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <!--执行mvn package,即执行 mvn clean package docker:build-->
+          <execution>
+            <id>build-image</id>
+            <phase>${docker.operate}</phase>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!--<serverId>36dockerHarbor</serverId>-->
+          <registryUrl>http://${docker.repostory}</registryUrl>
+          <!-- 镜像名称 -->
+          <imageName>${docker.repostory}/${docker.registry.name}/${project.artifactId}</imageName>
+          <!-- 指定标签 -->
+          <imageTags>
+            <imageTag>latest</imageTag>
+          </imageTags>
+          <!-- 指定远程 Docker API地址  -->
+          <dockerHost>${docker.url}</dockerHost>
+          <dockerDirectory>${basedir}/</dockerDirectory>
+          <!-- 复制 jar包到docker容器指定目录-->
+          <resources>
+            <resource>
+              <targetPath>/ROOT</targetPath>
+              <!-- 用于指定需要复制的根目录，${project.build.directory}表示target目录 -->
+              <directory>${project.build.directory}</directory>
+              <!-- 用于指定需要复制的文件，${project.build.finalName}.jar就是打包后的target目录下的jar包名称　-->
+              <include>${project.build.finalName}.jar</include>
+            </resource>
+          </resources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
--- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/StatBootApplication.java
+++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/StatBootApplication.java
@@ -0,0 +1,25 @@
+package com.njcn.stat;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月09日 20:59
+ */
+@Slf4j
+@MapperScan("com.njcn.**.mapper")
+@EnableFeignClients(basePackages = "com.njcn")
+@SpringBootApplication(scanBasePackages = "com.njcn")
+public class StatBootApplication {
+
+    public static void main(String[] args)  {
+        SpringApplication.run(StatBootApplication.class, args);
+    }
+
+}
--- a/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml
+++ b/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml
@@ -0,0 +1,53 @@
+#当前服务的基本信息
+microservice:
+  ename: '@artifactId@'
+  name: '@name@'
+  version: '@version@'
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10304
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+
+spring:
+  application:
+    name: @artifactId@
+  #nacos注册中心以及配置中心的指定
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-Id: algorithm-config.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+#项目日志的配置
+logging:
+  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.stat.pojo
+
+
+mqtt:
+  client-id: analysis-stat-boot${random.value}
--- a/iot-analysis/analysis-stat/stat-boot/src/test/java/com/njcn/AppTest.java
+++ b/iot-analysis/analysis-stat/stat-boot/src/test/java/com/njcn/AppTest.java
@@ -0,0 +1,20 @@
+package com.njcn;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
--- a/iot-analysis/analysis-zl-event/pom.xml
+++ b/iot-analysis/analysis-zl-event/pom.xml
@@ -0,0 +1,28 @@
+<?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">
+    <parent>
+        <artifactId>iot-analysis</artifactId>
+        <groupId>com.njcn</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>analysis-zl-event</artifactId>
+    <packaging>pom</packaging>
+
+    <name>analysis-zl-event</name>
+    <description>物解析-各类事件解析模块</description>
+    <modules>
+        <module>zl-event-api</module>
+        <module>zl-event-boot</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
--- a/iot-analysis/analysis-zl-event/zl-event-api/pom.xml
+++ b/iot-analysis/analysis-zl-event/zl-event-api/pom.xml
@@ -0,0 +1,21 @@
+<?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">
+    <parent>
+        <artifactId>analysis-zl-event</artifactId>
+        <groupId>com.njcn</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>zl-event-api</artifactId>
+
+    <name>zl-event-api</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+</project>
--- a/iot-analysis/analysis-zl-event/zl-event-boot/pom.xml
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/pom.xml
@@ -3,15 +3,15 @@
 <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">
    <parent>
-        <artifactId>iot-analysis</artifactId>
+        <artifactId>analysis-zl-event</artifactId>
        <groupId>com.njcn</groupId>
        <version>1.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

-    <artifactId>analysis-boot</artifactId>
+    <artifactId>zl-event-boot</artifactId>

-    <name>analysis-boot</name>
+    <name>zl-event-boot</name>

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -31,30 +31,18 @@
            <version>${project.version}</version>
        </dependency>
        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-core</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>com.njcn</groupId>
            <artifactId>common-db</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-poi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-redis</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
    </dependencies>

    <build>
-        <finalName>analysisboot</finalName>
+        <finalName>zleventboot</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/ZlEventBootApplication.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/ZlEventBootApplication.java
@@ -0,0 +1,25 @@
+package com.njcn.zlevent;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月09日 20:59
+ */
+@Slf4j
+@MapperScan("com.njcn.**.mapper")
+@EnableFeignClients(basePackages = "com.njcn")
+@SpringBootApplication(scanBasePackages = "com.njcn")
+public class ZlEventBootApplication {
+
+    public static void main(String[] args)  {
+        SpringApplication.run(ZlEventBootApplication.class, args);
+    }
+
+}
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml
@@ -0,0 +1,53 @@
+#当前服务的基本信息
+microservice:
+  ename: '@artifactId@'
+  name: '@name@'
+  version: '@version@'
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10305
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+
+spring:
+  application:
+    name: @artifactId@
+  #nacos注册中心以及配置中心的指定
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-Id: algorithm-config.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+#项目日志的配置
+logging:
+  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.zlevent.pojo
+
+
+mqtt:
+  client-id: analysis-zl-event-boot${random.value}
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/test/java/com/njcn/AppTest.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/test/java/com/njcn/AppTest.java
@@ -0,0 +1,20 @@
+package com.njcn;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
--- a/iot-analysis/pom.xml
+++ b/iot-analysis/pom.xml
@@ -16,8 +16,9 @@
    <description>物解析模块</description>

    <modules>
-        <module>analysis-api</module>
-        <module>analysis-boot</module>
+        <module>analysis-stat</module>
+        <module>analysis-rt</module>
+        <module>analysis-zl-event</module>
    </modules>

    <properties>