重构代码

huimv-eartag2-platform/.gitignore

@@ -31,3 +31,10 @@ build/
 
 ### VS Code ###
 .vscode/
+
+.idea
+.mvn
+.gitignore
+huimv-eartag2-platform.iml
+mvnw
+mvnw.cmd

huimv-eartag2-platform/huimv-eartag2-admin/pom.xml

@@ -11,6 +11,7 @@
 
     <artifactId>huimv-eartag2-admin</artifactId>
     <dependencies>
+        <!-- eartag2-common -->
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
@@ -43,5 +44,19 @@
 
 
     </dependencies>
-
+    <build>
+        <plugins>
+            <!--  -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!--  -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>

huimv-eartag2-platform/huimv-eartag2-common/pom.xml

@@ -13,19 +13,18 @@
 
     <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-common</artifactId>
-    <version>0.0.3</version>
-
-    <distributionManagement>
-        <repository>
-            <id>rdc-releases</id>
-            <url>https://repo.rdc.aliyun.com/repository/136471-release-drEU5y/</url>
-        </repository>
-        <snapshotRepository>
-            <id>rdc-snapshots</id>
-            <url>https://repo.rdc.aliyun.com/repository/136471-snapshot-WhviYl/</url>
-        </snapshotRepository>
-    </distributionManagement>
+    <version>0.0.2-SNAPSHOT</version>
 
+<!--    <distributionManagement>-->
+<!--        <repository>-->
+<!--            <id>rdc-releases</id>-->
+<!--            <url>https://repo.rdc.aliyun.com/repository/136471-release-drEU5y/</url>-->
+<!--        </repository>-->
+<!--        <snapshotRepository>-->
+<!--            <id>rdc-snapshots</id>-->
+<!--            <url>https://repo.rdc.aliyun.com/repository/136471-snapshot-WhviYl/</url>-->
+<!--        </snapshotRepository>-->
+<!--    </distributionManagement>-->
     <dependencies>
 
         <dependency>
@@ -75,43 +74,44 @@
     </dependencies>
 
     <!-- 后加 -->
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
+<!--    <build>-->
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>src/main/java</directory>-->
+<!--                <includes>-->
+<!--                    <include>**/*.*</include>-->
+<!--                </includes>-->
+<!--                <excludes>-->
+<!--                    <exclude>**/*.java</exclude>-->
+<!--                </excludes>-->
+<!--                <filtering>false</filtering>-->
+<!--            </resource>-->
+<!--        </resources>-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-compiler-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <source>8</source>-->
+<!--                    <target>8</target>-->
+<!--                </configuration>-->
 
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <!--
-                1. 这里要指定你的springboot项目的主启动类的全类名
-                2. 大家不要把这个插件放到父项目的依赖中，哪个项目需要打包，就放到哪个项目的依赖下
-                    -->
-                    <mainClass>com.huimv.eartag2.common</mainClass>
-                </configuration>
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    &lt;!&ndash;-->
+<!--                1. 这里要指定你的springboot项目的主启动类的全类名-->
+<!--                2. 大家不要把这个插件放到父项目的依赖中，哪个项目需要打包，就放到哪个项目的依赖下-->
+<!--                    &ndash;&gt;-->
+<!--                    <mainClass>com.huimv.eartag2.common</mainClass>-->
+<!--                </configuration>-->
+
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 
-            </plugin>
-        </plugins>
-    </build>
 <!--    <build>-->
 <!--        <finalName>${project.artifactId}</finalName>-->
 <!--    </build>-->

huimv-eartag2-platform/huimv-eartag2-device/pom.xml

@@ -12,6 +12,13 @@
     <artifactId>huimv-eartag2-device</artifactId>
 
     <dependencies>
+        <!-- eartag2-common -->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-eartag2-common</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+        </dependency>
+
         <!-- 排除Tomcat容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -34,12 +41,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- eartag2-common -->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <!--rabbitmq-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

huimv-eartag2-platform/huimv-eartag2-eartag/pom.xml

@@ -12,6 +12,18 @@
     <artifactId>huimv-eartag2-eartag</artifactId>
 
     <dependencies>
+        <!-- eartag2-common -->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-eartag2-common</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+        </dependency>
+        <!--  -->
+<!--        <dependency>-->
+<!--            <artifactId>huimv-eartag2-manage2</artifactId>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
         <!-- 排除Tomcat容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -34,12 +46,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- eartag2-common -->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <!--rabbitmq-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -56,13 +62,6 @@
             <version>0.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
-        <dependency>
-            <artifactId>huimv-eartag2-manage2</artifactId>
-            <groupId>com.huimv</groupId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
     </dependencies>
 
     <build>

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -10,9 +10,9 @@ import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.eartag.service.ICacheService;
 import com.huimv.eartag2.eartag.service.IDeviceService;
 import com.huimv.eartag2.eartag.service.IEartagService;
-import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
-import com.huimv.eartag2.manage2.pojo.EartagData2;
-import com.huimv.eartag2.manage2.service.IEartagData2Service;
+//import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
+//import com.huimv.eartag2.manage2.pojo.EartagData2;
+//import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -39,11 +39,10 @@ import java.util.Map;
 @Service
 @Slf4j
 public class EartagServiceImpl implements IEartagService {
-    @Resource
-    private IEartagData2Service eartagData2Service;
-
-    @Resource
-    private  EartagData2Mapper eartagData2Mapper;
+//    @Resource
+//    private IEartagData2Service eartagData2Service;
+//    @Resource
+//    private  EartagData2Mapper eartagData2Mapper;
     @Autowired
     private RedisTemplate redisTemplate;
     @Autowired
@@ -653,53 +652,53 @@ public class EartagServiceImpl implements IEartagService {
         DateUtil dateUtil = new DateUtil();
         //判断近五分钟内是否有耳标数据 先获取耳标号
         String earmark = eartagJo.getString("earmark");
-        List<EartagData2> eartagFlowByEarmark = eartagData2Service.getEartagData(earmark);
-        if (null == eartagFlowByEarmark ||eartagFlowByEarmark.size() == 0 ){
-            //插数据到数据库里
-            EartagData2 dataEntity2 = new EartagData2();
-            dataEntity2.setCmdHeader(eartagJo.getString("cmdHeader"));
-            dataEntity2.setDevice(eartagJo.getString("device"));
-            dataEntity2.setEarmark(eartagJo.getString("earmark"));
-            dataEntity2.setBat(Integer.parseInt(eartagJo.getString("bat")));
-            dataEntity2.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
-            dataEntity2.setEarTemp1(eartagJo.getFloat("earTemp1"));
-            dataEntity2.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
-            dataEntity2.setEnvTemp1(eartagJo.getFloat("envTemp1"));
-            dataEntity2.setAct(Integer.parseInt(eartagJo.getString("act")));
-            dataEntity2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
-            dataEntity2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
-            Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
-            Date date1 = new Date();
-            Timestamp timestamp = new Timestamp(date1.getTime());
-            dataEntity2.setAskTime(timestamp);
-            dataEntity2.setOther(eartagJo.getString("other"));
-            dataEntity2.setAddTime(nowTimestamp);
-            dataEntity2.setCreateDate(todayDate);
-            dataEntity2.setFarmId(farmId);
-            dataEntity2.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
-            eartagData2Mapper.insert(dataEntity2);
-        }else {
-            EartagData2 eartagData2 = eartagFlowByEarmark.get(0);
-            eartagData2.setCmdHeader(eartagJo.getString("cmdHeader"));
-            eartagData2.setDevice(eartagJo.getString("device"));
-            eartagData2.setEarmark(eartagJo.getString("earmark"));
-            eartagData2.setBat(Integer.parseInt(eartagJo.getString("bat")));
-            eartagData2.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
-            eartagData2.setEarTemp1(eartagJo.getFloat("earTemp1"));
-            eartagData2.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
-            eartagData2.setEnvTemp1(eartagJo.getFloat("envTemp1"));
-            eartagData2.setAct(Integer.parseInt(eartagJo.getString("act")));
-            eartagData2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
-            eartagData2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
-            Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
-            Timestamp timestamp = new Timestamp(date.getTime());
-            eartagData2.setAskTime(timestamp);
-            eartagData2.setOther(eartagJo.getString("other"));
-            eartagData2.setCreateDate(todayDate);
-            eartagData2.setFarmId(farmId);
-            eartagData2.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
-            eartagData2Mapper.updateById(eartagData2);
-        }
+//        List<EartagData2> eartagFlowByEarmark = eartagData2Service.getEartagData(earmark);
+//        if (null == eartagFlowByEarmark ||eartagFlowByEarmark.size() == 0 ){
+//            //插数据到数据库里
+//            EartagData2 dataEntity2 = new EartagData2();
+//            dataEntity2.setCmdHeader(eartagJo.getString("cmdHeader"));
+//            dataEntity2.setDevice(eartagJo.getString("device"));
+//            dataEntity2.setEarmark(eartagJo.getString("earmark"));
+//            dataEntity2.setBat(Integer.parseInt(eartagJo.getString("bat")));
+//            dataEntity2.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
+//            dataEntity2.setEarTemp1(eartagJo.getFloat("earTemp1"));
+//            dataEntity2.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
+//            dataEntity2.setEnvTemp1(eartagJo.getFloat("envTemp1"));
+//            dataEntity2.setAct(Integer.parseInt(eartagJo.getString("act")));
+//            dataEntity2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
+//            dataEntity2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
+//            Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
+//            Date date1 = new Date();
+//            Timestamp timestamp = new Timestamp(date1.getTime());
+//            dataEntity2.setAskTime(timestamp);
+//            dataEntity2.setOther(eartagJo.getString("other"));
+//            dataEntity2.setAddTime(nowTimestamp);
+//            dataEntity2.setCreateDate(todayDate);
+//            dataEntity2.setFarmId(farmId);
+//            dataEntity2.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
+//            eartagData2Mapper.insert(dataEntity2);
+//        }else {
+//            EartagData2 eartagData2 = eartagFlowByEarmark.get(0);
+//            eartagData2.setCmdHeader(eartagJo.getString("cmdHeader"));
+//            eartagData2.setDevice(eartagJo.getString("device"));
+//            eartagData2.setEarmark(eartagJo.getString("earmark"));
+//            eartagData2.setBat(Integer.parseInt(eartagJo.getString("bat")));
+//            eartagData2.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
+//            eartagData2.setEarTemp1(eartagJo.getFloat("earTemp1"));
+//            eartagData2.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
+//            eartagData2.setEnvTemp1(eartagJo.getFloat("envTemp1"));
+//            eartagData2.setAct(Integer.parseInt(eartagJo.getString("act")));
+//            eartagData2.setAct1(Integer.parseInt(eartagJo.getString("act1")));
+//            eartagData2.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
+//            Date date = Convert.toDate(getAskTime(eartagJo.getString("askTime")));
+//            Timestamp timestamp = new Timestamp(date.getTime());
+//            eartagData2.setAskTime(timestamp);
+//            eartagData2.setOther(eartagJo.getString("other"));
+//            eartagData2.setCreateDate(todayDate);
+//            eartagData2.setFarmId(farmId);
+//            eartagData2.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
+//            eartagData2Mapper.updateById(eartagData2);
+//        }
     }
 
     //

huimv-eartag2-platform/huimv-eartag2-input/pom.xml

@@ -14,13 +14,14 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <!--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
     </properties>
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-web</artifactId>-->
-<!--        </dependency>-->
+        <!-- eartag2-common -->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-eartag2-common</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+        </dependency>
         <!-- 排除Tomcat容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -33,97 +34,22 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <!-- 添加 Undertow 容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- eartag2-common -->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
-<!--        &lt;!&ndash; JPA &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash; mysql &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>mysql</groupId>-->
-<!--            <artifactId>mysql-connector-java</artifactId>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; redis &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
-<!--        </dependency>-->
-
         <!-- netty -->
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
             <version>4.1.45.Final</version>
         </dependency>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
-            <scope>provided</scope>
-        </dependency>
-        <!--hutool-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.6.5</version>
-        </dependency>
-        <!-- httpclient -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <!--rabbitmq-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
-
-        <!--rabbitmq.client-->
-<!--        <dependency>-->
-<!--            <groupId>com.rabbitmq</groupId>-->
-<!--            <artifactId>amqp-client</artifactId>-->
-<!--            <version>3.4.1</version>-->
-<!--        </dependency>-->
-
-        <!-- actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-<!--        &lt;!&ndash; 引入Actuator监控依赖 &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-actuator</artifactId>-->
-<!--        </dependency>-->
     </dependencies>
 
         <build>

huimv-eartag2-platform/huimv-eartag2-manage/pom.xml

@@ -23,20 +23,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
-
-        <!--rabbitmq.client-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.rabbitmq</groupId>-->
-        <!--            <artifactId>amqp-client</artifactId>-->
-        <!--            <version>3.4.1</version>-->
-        <!--        </dependency>-->
-
         <!-- actuator -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
         <!-- 排除Tomcat容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -61,38 +52,6 @@
             <version>4.5.5</version>
         </dependency>
 
-        <!-- 基准测试 start -->
-<!--        <dependency>-->
-<!--            <groupId>org.openjdk.jmh</groupId>-->
-<!--            <artifactId>jmh-core</artifactId>-->
-<!--            <version>1.21</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.openjdk.jmh</groupId>-->
-<!--            <artifactId>jmh-generator-annprocess</artifactId>-->
-<!--            <version>1.21</version>-->
-<!--        </dependency>-->
-        <!-- 基准测试 end -->
-
-        <!-- 基准demo测试 start -->
-<!--        &lt;!&ndash;fastjson依赖&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>fastjson</artifactId>-->
-<!--            <version>1.2.56</version>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash;jackson依赖&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.fasterxml.jackson.core</groupId>-->
-<!--            <artifactId>jackson-databind</artifactId>-->
-<!--            <version>2.9.4</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.fasterxml.jackson.core</groupId>-->
-<!--            <artifactId>jackson-annotations</artifactId>-->
-<!--            <version>2.9.4</version>-->
-<!--        </dependency>-->
-        <!-- 基准demo测试 end -->
     </dependencies>
 
     <build>

huimv-eartag2-platform/huimv-eartag2-manage2/pom.xml

@@ -14,6 +14,7 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
+        <!-- eartag2-common -->
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
@@ -24,13 +25,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
-        <!--rabbitmq.client-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.rabbitmq</groupId>-->
-        <!--            <artifactId>amqp-client</artifactId>-->
-        <!--            <version>3.4.1</version>-->
-        <!--        </dependency>-->
-        <!-- actuator -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -58,7 +52,6 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.5</version>
         </dependency>
-
         <!--Mybatis-Plus生成器依赖-->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -109,66 +102,10 @@
             <artifactId>junit-platform-commons</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-manage</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.8.5</version>
         </dependency>
-        <!-- 基准测试 start -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.openjdk.jmh</groupId>-->
-        <!--            <artifactId>jmh-core</artifactId>-->
-        <!--            <version>1.21</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.openjdk.jmh</groupId>-->
-        <!--            <artifactId>jmh-generator-annprocess</artifactId>-->
-        <!--            <version>1.21</version>-->
-        <!--        </dependency>-->
-        <!-- 基准测试 end -->
-
-        <!-- 基准demo测试 start -->
-        <!--        &lt;!&ndash;fastjson依赖&ndash;&gt;-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.alibaba</groupId>-->
-        <!--            <artifactId>fastjson</artifactId>-->
-        <!--            <version>1.2.56</version>-->
-        <!--        </dependency>-->
-        <!--        &lt;!&ndash;jackson依赖&ndash;&gt;-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.fasterxml.jackson.core</groupId>-->
-        <!--            <artifactId>jackson-databind</artifactId>-->
-        <!--            <version>2.9.4</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.fasterxml.jackson.core</groupId>-->
-        <!--            <artifactId>jackson-annotations</artifactId>-->
-        <!--            <version>2.9.4</version>-->
-        <!--        </dependency>-->
-        <!-- 基准demo测试 end -->
     </dependencies>
 
     <build>

huimv-eartag2-platform/pom.xml

@@ -16,7 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.6.2</version>
-<!--        <relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->
     </parent>
     <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-platform</artifactId>
@@ -29,43 +28,20 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.28</version>
         </dependency>
-        <!-- JPA -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <!-- mysql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <!-- redis -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
-            <scope>provided</scope>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
         <!-- lombok -->
         <dependency>
@@ -78,7 +54,8 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>LATEST</version>
+<!--            <version>LATEST</version>-->
+            <version>5.6.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -90,88 +67,98 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.7</version>
         </dependency>
-
+        <!-- JPA -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!-- actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 
+<!--&lt;!&ndash;    <build>&ndash;&gt;-->
+<!--&lt;!&ndash;        <plugins>&ndash;&gt;-->
+<!--&lt;!&ndash;            &lt;!&ndash;  &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;            <plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;                <groupId>org.springframework.boot</groupId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <artifactId>spring-boot-maven-plugin</artifactId>&ndash;&gt;-->
+<!--&lt;!&ndash;            </plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;            &lt;!&ndash;  &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;            <plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;                <groupId>org.apache.maven.plugins</groupId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <artifactId>maven-resources-plugin</artifactId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <version>2.6</version>&ndash;&gt;-->
+<!--&lt;!&ndash;            </plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;        </plugins>&ndash;&gt;-->
+<!--&lt;!&ndash;    </build>&ndash;&gt;-->
 
 <!--    <build>-->
 <!--        <plugins>-->
-<!--            &lt;!&ndash;  &ndash;&gt;-->
+
+<!--&lt;!&ndash;            <plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;                <groupId>org.apache.maven.plugins</groupId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <artifactId>maven-compiler-plugin</artifactId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <version>3.1</version>&ndash;&gt;-->
+<!--&lt;!&ndash;                <configuration>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <source>${java.version}</source>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <target>${java.version}</target>&ndash;&gt;-->
+<!--&lt;!&ndash;                </configuration>&ndash;&gt;-->
+<!--&lt;!&ndash;            </plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;            <plugin>&ndash;&gt;-->
+<!--&lt;!&ndash;                <groupId>org.apache.maven.plugins</groupId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <artifactId>maven-resources-plugin</artifactId>&ndash;&gt;-->
+<!--&lt;!&ndash;                <version>2.6</version>&ndash;&gt;-->
+<!--&lt;!&ndash;                <configuration>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <delimiters>&ndash;&gt;-->
+<!--&lt;!&ndash;                        <delimiter>@</delimiter>&ndash;&gt;-->
+<!--&lt;!&ndash;                    </delimiters>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <useDefaultDelimiters>false</useDefaultDelimiters>&ndash;&gt;-->
+<!--&lt;!&ndash;                </configuration>&ndash;&gt;-->
+<!--&lt;!&ndash;            </plugin>&ndash;&gt;-->
 <!--            <plugin>-->
 <!--                <groupId>org.springframework.boot</groupId>-->
 <!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--            </plugin>-->
-<!--            &lt;!&ndash;  &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-resources-plugin</artifactId>-->
-<!--                <version>2.6</version>-->
+<!--&lt;!&ndash;                <configuration>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <classifier>execute</classifier>&ndash;&gt;-->
+<!--&lt;!&ndash;                </configuration>&ndash;&gt;-->
 <!--            </plugin>-->
 <!--        </plugins>-->
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>src/main/webapp</directory>-->
+<!--                <filtering>false</filtering>-->
+<!--            </resource>-->
+<!--            <resource>-->
+<!--                <directory>src/main/resources</directory>-->
+<!--                <filtering>true</filtering>-->
+<!--            </resource>-->
+<!--            <resource>-->
+<!--                <directory>src/main/java</directory>-->
+<!--                <includes>-->
+<!--                    <include>**/*.xml</include>-->
+<!--                </includes>-->
+<!--            </resource>-->
+<!--        </resources>-->
 <!--    </build>-->
 
-    <build>
-        <plugins>
-
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-compiler-plugin</artifactId>-->
-<!--                <version>3.1</version>-->
-<!--                <configuration>-->
-<!--                    <source>${java.version}</source>-->
-<!--                    <target>${java.version}</target>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-resources-plugin</artifactId>-->
-<!--                <version>2.6</version>-->
-<!--                <configuration>-->
-<!--                    <delimiters>-->
-<!--                        <delimiter>@</delimiter>-->
-<!--                    </delimiters>-->
-<!--                    <useDefaultDelimiters>false</useDefaultDelimiters>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-<!--                <configuration>-->
-<!--                    <classifier>execute</classifier>-->
-<!--                </configuration>-->
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/webapp</directory>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-
 <!--    <profiles>-->
 <!--        <profile>-->
 <!--            <id>local</id>-->