【fix】版本控制pom文件重构

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

@@ -53,6 +53,10 @@
             <artifactId>httpcore</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -68,5 +68,28 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
     </dependencies>
 </project>

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

@@ -50,8 +50,29 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-manage2</artifactId>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.1</version>
         </dependency>
     </dependencies>
 </project>

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

@@ -8,8 +8,8 @@ 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.mapper.EartagData2Mapper;
+import com.huimv.eartag2.manage2.pojo.EartagData2;*/
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -38,8 +38,8 @@ import java.util.Map;
 @Slf4j
 public class EartagServiceImpl implements IEartagService {
 
-    @Resource
-    private static EartagData2Mapper eartagData2Mapper;
+/*    @Resource
+    private static EartagData2Mapper eartagData2Mapper;*/
 /*    @Resource
     private EartagData2Mapper eartagData2Mapper;*/
     @Autowired
@@ -87,7 +87,7 @@ public class EartagServiceImpl implements IEartagService {
             //{保存耳标流水}
             saveEartagFlow(dataJo, nowTimestamp, todayDate, farmId);
 
-            saveEartagFlow2(dataJo, nowTimestamp, todayDate, farmId);
+           /* saveEartagFlow2(dataJo, nowTimestamp, todayDate, farmId);*/
 
             //{更新设备注册信息}
             updateDeviceRegister(deviceCode, nowTimestamp, todayDate, farmId);
@@ -647,7 +647,7 @@ public class EartagServiceImpl implements IEartagService {
         cacheService.putEartagFlowToCache(dataEntity.getEarmark(),dataEntity);
     }
 
-    public void saveEartagFlow2(JSONObject eartagJo, Timestamp nowTimestamp, java.sql.Date todayDate, String farmId) throws ParseException {
+    /*public void saveEartagFlow2(JSONObject eartagJo, Timestamp nowTimestamp, java.sql.Date todayDate, String farmId) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         //判断近五分钟内是否有耳标数据 先获取耳标号
         String earmark = eartagJo.getString("earmark");
@@ -697,7 +697,7 @@ public class EartagServiceImpl implements IEartagService {
             eartagFlowByEarmark.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
             eartagData2Mapper.updateById(eartagFlowByEarmark);
         }
-    }
+    }*/
 
     //
     public String getAskTime(String askTime) {

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

@@ -84,6 +84,11 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -70,6 +70,22 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
         <!-- 排除Tomcat容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -17,13 +17,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>
@@ -104,41 +97,27 @@
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-manage</artifactId>
-        </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 -->
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+        </dependency>
 
-        <!-- 基准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>
 </project>

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

@@ -26,5 +26,32 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
     </dependencies>
 </project>

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

@@ -54,5 +54,38 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
     </dependencies>
 </project>

huimv-eartag2-platform/pom.xml

@@ -18,17 +18,21 @@
         <module>huimv-eartag2-device</module>
         <module>huimv-eartag2-eartag</module>
         <module>huimv-eartag2-admin</module>
+        <module>huimv-eartag2-process</module>
+        <module>huimv-eartag2-process2</module>
     </modules>
+
     <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-platform</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>huimv-eartag2-platform</name>
     <description>Demo project for Spring Boot</description>
     <packaging>pom</packaging>
+
     <properties>
         <java.version>1.8</java.version>
         <maven.compile>1.8</maven.compile>
-        <huimv.version>0.0.1-SNAPSHOT</huimv.version>
+        <huimv.version>0.0.2-SNAPSHOT</huimv.version>
     </properties>
 
     <dependencyManagement>
@@ -79,22 +83,13 @@
                 <artifactId>javax.servlet-api</artifactId>
                 <version>3.1.0</version>
             </dependency>
+
             <!-- 二方包统一版本管理 -->
             <dependency>
                 <groupId>com.huimv</groupId>
                 <artifactId>huimv-eartag2-common</artifactId>
                 <version>${huimv.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.huimv</groupId>
-                <artifactId>huimv-eartag2-manage2</artifactId>
-                <version>${huimv.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.huimv</groupId>
-                <artifactId>huimv-eartag2-manage</artifactId>
-                <version>${huimv.version}</version>
-            </dependency>
 
         </dependencies>
     </dependencyManagement>