更新jar包

registration-center/pom.xml

@@ -54,11 +54,11 @@
             <scope>provided</scope>
         </dependency>
         <!--hutool-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>LATEST</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.hutool</groupId>-->
+<!--            <artifactId>hutool-all</artifactId>-->
+<!--            <version>LATEST</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -167,11 +167,19 @@
             <artifactId>junit-platform-commons</artifactId>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <artifactId>huimv-eartag2-common</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>com.huimv</groupId>
-            <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.5-SNAPSHOT</version>
+<!--            <version>0.0.2-SNAPSHOT</version>-->
         </dependency>
+
     </dependencies>
 
     <build>

registration-center/registration-center.iml

@@ -36,41 +36,6 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.14.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.8.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.threads:jboss-threads:3.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.2.14.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.2.14.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.websocket:jakarta.websocket-api:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.45.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.13.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.14" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.2" level="project" />
@@ -102,8 +67,8 @@
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
@@ -113,7 +78,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
@@ -142,7 +107,6 @@
     <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.13" level="project" />
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
@@ -197,23 +161,15 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.14" level="project" />
     <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
     <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.huimv:huimv-eartag2-common:0.0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.5" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.huimv:huimv-common:0.0.5-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.11" level="project" />
   </component>
 </module>

registration-center/src/main/java/com/huimv/center/controller/BizBaseAreaController.java

@@ -1,7 +1,7 @@
 package com.huimv.center.controller;
 
 import com.huimv.center.service.BizBaseAreaService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

registration-center/src/main/java/com/huimv/center/controller/BizDeviceAnswerFlowController.java

@@ -2,7 +2,7 @@ package com.huimv.center.controller;
 
 
 import com.huimv.center.service.BizDeviceAnswerFlowService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisterController.java

@@ -4,8 +4,8 @@ package com.huimv.center.controller;
 import com.huimv.center.pojo.BizFarm;
 import com.huimv.center.service.BizDeviceRegisterService;
 import com.huimv.center.service.BizFarmService;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisteredFlowController.java

@@ -2,7 +2,7 @@ package com.huimv.center.controller;
 
 
 import com.huimv.center.service.BizDeviceRegisteredFlowService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

registration-center/src/main/java/com/huimv/center/controller/BizDeviceUnregisteredController.java

@@ -2,7 +2,7 @@ package com.huimv.center.controller;
 
 
 import com.huimv.center.service.BizDeviceUnregisteredService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

registration-center/src/main/java/com/huimv/center/controller/BizDeviceUnregisteredFlowController.java

@@ -2,7 +2,7 @@ package com.huimv.center.controller;
 
 
 import com.huimv.center.service.BizDeviceUnregisteredFlowService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

registration-center/src/main/java/com/huimv/center/controller/BizFarmController.java

@@ -2,7 +2,7 @@ package com.huimv.center.controller;
 
 
 import com.huimv.center.service.BizFarmService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

registration-center/src/main/java/com/huimv/center/controller/BizRawDataController.java

@@ -3,7 +3,7 @@ package com.huimv.center.controller;
 
 import com.huimv.center.service.BizDeviceUnregisteredService;
 import com.huimv.center.service.BizRawDataService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

registration-center/src/main/java/com/huimv/center/service/BizBaseAreaService.java

@@ -1,11 +1,11 @@
 package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizBaseArea;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 public interface BizBaseAreaService {
 
-     Result add(String name,String code,String parentCode);
+     Result add(String name, String code, String parentCode);
 
      Result remove(String id);
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceAnswerFlowService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisterService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceRegister;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 import java.util.Map;
@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface BizDeviceRegisterService extends IService<BizDeviceRegister> {
 
-    Result add(String farmName,String farmCode,String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
+    Result add(String farmName, String farmCode, String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
 
     Result edit(Integer id, String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisteredFlowService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceRegisteredFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredFlowService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceUnregistered;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 

registration-center/src/main/java/com/huimv/center/service/BizFarmService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizFarm;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 
@@ -16,7 +16,7 @@ import java.text.ParseException;
  */
 public interface BizFarmService extends IService<BizFarm> {
 
-    Result save(String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException;
+    Result save(String farmName, String farmCode, String linkman, String phone, String remark, String areaName) throws ParseException;
 
     Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException;
 

registration-center/src/main/java/com/huimv/center/service/BizRawDataService.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizRawData;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.text.ParseException;
 import java.util.Map;

registration-center/src/main/java/com/huimv/center/service/impl/BizBaseAreaServiceImpl.java

@@ -6,8 +6,8 @@ import com.huimv.center.pojo.BizBaseArea;
 import com.huimv.center.service.BizBaseAreaService;
 import com.huimv.center.utils.IDUtil;
 import com.huimv.center.vo.BaseAreaVo;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceAnswerFlowServiceImpl.java

@@ -6,10 +6,10 @@ import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.mapper.BizDeviceAnswerFlowMapper;
 import com.huimv.center.service.BizDeviceAnswerFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.java

@@ -9,10 +9,10 @@ import com.huimv.center.pojo.BizDeviceRegister;
 import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.huimv.center.producer.Producer;
 import com.huimv.center.service.BizDeviceRegisterService;
+import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,7 +59,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
      * @Time        : 20:47
      */
     @Override
-    public Result add(String farmName,String farmCode,String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException {
+    public Result add(String farmName, String farmCode, String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizDeviceRegister deviceRegister = new BizDeviceRegister();
         deviceRegister.setChipId(chipId);

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.java

@@ -6,10 +6,10 @@ import com.huimv.center.pojo.BizDeviceRegisteredFlow;
 import com.huimv.center.mapper.BizDeviceRegisteredFlowMapper;
 import com.huimv.center.service.BizDeviceRegisteredFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredFlowServiceImpl.java

@@ -6,10 +6,10 @@ import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.huimv.center.mapper.BizDeviceUnregisteredFlowMapper;
 import com.huimv.center.service.BizDeviceUnregisteredFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.java

@@ -6,10 +6,10 @@ import com.huimv.center.pojo.BizDeviceUnregistered;
 import com.huimv.center.mapper.BizDeviceUnregisteredMapper;
 import com.huimv.center.service.BizDeviceUnregisteredService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java

@@ -10,9 +10,9 @@ import com.huimv.center.pojo.BizRawData;
 import com.huimv.center.service.BizBaseAreaService;
 import com.huimv.center.service.BizFarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.center.utils.DateUtil;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
      * @Time        : 14:46
      */
     @Override
-    public Result save(String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException {
+    public Result save(String farmName, String farmCode, String linkman, String phone, String remark, String areaName) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizFarm farm = new BizFarm();
         farm.setFarmName(farmName);

registration-center/src/main/java/com/huimv/center/service/impl/BizRawDataServiceImpl.java

@@ -7,9 +7,9 @@ import com.huimv.center.pojo.BizRawData;
 import com.huimv.center.mapper.BizRawDataMapper;
 import com.huimv.center.service.BizRawDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huimv.eartag2.common.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.center.utils.DateUtil;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

registration-center/src/main/java/com/huimv/center/utils/DateUtil.java

@@ -24,7 +24,10 @@ public class DateUtil {
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return new Timestamp(sdf.parse(date).getTime());
     }
-
+    public Date getTodayDatetime() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.parse(sdf.format(new Date()));
+    }
     /**
      * @Method      : buildEndDate
      * @Description :

registration-center/src/main/java/com/huimv/center/utils/ResultUtil.java

@@ -1,7 +1,7 @@
 package com.huimv.center.utils;
 
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.stereotype.Component;
 
 /**

registration-center/src/test/java/com/huimv/center/service/BizDeviceAnswerFlowServiceTest.java

@@ -3,7 +3,6 @@ package com.huimv.center.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizDeviceAnswerFlow;
-import com.huimv.eartag2.common.utils.Result;
 import org.junit.Test;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.runner.RunWith;

registration-center/src/test/java/com/huimv/center/service/BizDeviceRegisterTest.java

@@ -2,7 +2,7 @@ package com.huimv.center.service;
 
 import cn.hutool.core.text.csv.CsvUtil;
 import com.huimv.center.utils.DateUtil;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

registration-center/src/test/java/com/huimv/center/service/BizDeviceRegisteredFlowServiceTest.java

@@ -1,7 +1,7 @@
 package com.huimv.center.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

registration-center/src/test/java/com/huimv/center/service/BizFarmServiceTest.java

@@ -1,6 +1,6 @@
 package com.huimv.center.service;
 
-import com.huimv.eartag2.common.utils.Result;
+import com.huimv.common.utils.Result;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;