【fix】信息同步字段修改

.idea/inspectionProfiles/Project_Default.xml

@@ -30,7 +30,7 @@
       <option name="IGNORE_JAVADOC_PERIOD" value="true" />
       <option name="IGNORE_DUPLICATED_THROWS" value="false" />
       <option name="IGNORE_POINT_TO_ITSELF" value="false" />
-      <option name="myAdditionalJavadocTags" value="date" />
+      <option name="myAdditionalJavadocTags" value="date,Description:,param:,description:,Author:,CreateTime:,Version:,author:,date:" />
     </inspection_tool>
   </profile>
 </component>

.idea/libraries/Maven__antlr_antlr_2_7_7.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: antlr:antlr:2.7.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: cn.hutool:hutool-all:5.8.4">
+  <library name="Maven: cn.hutool:hutool-all:5.7.11">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.4/hutool-all-5.8.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.11/hutool-all-5.7.11.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.4/hutool-all-5.8.4-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.11/hutool-all-5.7.11-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.4/hutool-all-5.8.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.11/hutool-all-5.7.11-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_auth0_java_jwt_3_3_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.auth0:java-jwt:3.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.3.0/java-jwt-3.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.3.0/java-jwt-3.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.3.0/java-jwt-3.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.5.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_huimv_huimv_common_0_0_5_SNAPSHOT.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.huimv:huimv-common:0.0.5-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huimv/huimv-common/0.0.5-SNAPSHOT/huimv-common-0.0.5-20220804.054345-6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huimv/huimv-common/0.0.5-SNAPSHOT/huimv-common-0.0.5-20220804.054345-6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/huimv/huimv-common/0.0.5-SNAPSHOT/huimv-common-0.0.5-20220804.054345-6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_huimv_huimv_eartag2_common_0_0_1_SNAPSHOT.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.huimv:huimv-eartag2-common:0.0.1-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huimv/huimv-eartag2-common/0.0.1-SNAPSHOT/huimv-eartag2-common-0.0.1-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huimv/huimv-eartag2-common/0.0.1-SNAPSHOT/huimv-eartag2-common-0.0.1-SNAPSHOT-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/huimv/huimv-eartag2-common/0.0.1-SNAPSHOT/huimv-eartag2-common-0.0.1-SNAPSHOT-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.sun.activation:jakarta.activation:1.2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.sun.istack:istack-commons-runtime:3.0.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.12/istack-commons-runtime-3.0.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.12/istack-commons-runtime-3.0.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.12/istack-commons-runtime-3.0.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-beanutils:commons-beanutils:1.7.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__commons_collections_commons_collections_3_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-collections:commons-collections:3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2/commons-collections-3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.jsonwebtoken:jjwt:0.9.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/2.2.3/jakarta.persistence-api-2.2.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/1.3.3/jakarta.transaction-api-1.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.ezmorph:ezmorph:1.0.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_2_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3-jdk15.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.8">
+  <library name="Maven: org.apache.commons:commons-lang3:3.7">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8/commons-lang3-3.8.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8/commons-lang3-3.8-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8/commons-lang3-3.8-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.aspectj:aspectjweaver:1.9.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.7/aspectjweaver-1.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.7/aspectjweaver-1.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.7/aspectjweaver-1.9.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.5/jaxb-runtime-2.3.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.5/jaxb-runtime-2.3.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.5/jaxb-runtime-2.3.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.glassfish.jaxb:txw2:2.3.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.5/txw2-2.3.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.5/txw2-2.3.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.5/txw2-2.3.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.1.2.Final/hibernate-commons-annotations-5.1.2.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.1.2.Final/hibernate-commons-annotations-5.1.2.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/5.1.2.Final/hibernate-commons-annotations-5.1.2.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_3_Final.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate:hibernate-core:5.6.3.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.6.3.Final/hibernate-core-5.6.3.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.6.3.Final/hibernate-core-5.6.3.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.6.3.Final/hibernate-core-5.6.3.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss:jandex:2.2.3.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.2.3.Final/jandex-2.2.3.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.2.3.Final/jandex-2.2.3.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jandex/2.2.3.Final/jandex-2.2.3.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.6.2/spring-boot-starter-aop-2.6.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.6.2/spring-boot-starter-aop-2.6.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.6.2/spring-boot-starter-aop-2.6.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_6_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.6.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.6.2/spring-boot-starter-data-jpa-2.6.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.6.2/spring-boot-starter-data-jpa-2.6.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.6.2/spring-boot-starter-data-jpa-2.6.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.data:spring-data-jpa:2.6.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.6.0/spring-data-jpa-2.6.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.6.0/spring-data-jpa-2.6.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.6.0/spring-data-jpa-2.6.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_aspects_5_3_14.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aspects:5.3.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.3.14/spring-aspects-5.3.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.3.14/spring-aspects-5.3.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.3.14/spring-aspects-5.3.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_spring_orm_5_3_14.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-orm:5.3.14">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.3.14/spring-orm-5.3.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.3.14/spring-orm-5.3.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.3.14/spring-orm-5.3.14-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

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

@@ -3,11 +3,8 @@ package com.huimv.center.controller;
 
 import com.huimv.center.service.BizBaseStageService;
 import com.huimv.common.utils.Result;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -45,7 +42,12 @@ public class BizBaseStageController {
 
     @PostMapping("/list")
     private Result listBizBaseStage(@RequestBody Map<String,String> param){
-      return   bizBaseStageService.listBizBaseStage(param);
+       return bizBaseStageService.listBizBaseStage(param);
+    }
+
+    @GetMapping ("/getData")
+     private Result getDataById(@Param("id") String id){
+        return bizBaseStageService.getDataById(id);
     }
 }
 

registration-center/src/main/java/com/huimv/center/listener/SysBaseConfigListener.java

@@ -1,7 +1,9 @@
 package com.huimv.center.listener;
 
+import com.huimv.center.pojo.BizBaseArea;
 import com.huimv.center.pojo.BizDeviceRegister;
 import com.huimv.center.pojo.BizFarm;
+import com.huimv.center.service.BizBaseAreaService;
 import com.huimv.center.service.BizDeviceRegisterService;
 import com.huimv.center.service.BizFarmService;
 import com.huimv.center.utils.Const;
@@ -32,6 +34,9 @@ public class SysBaseConfigListener {
     @Resource
     private BizDeviceRegisterService bizDeviceRegisterService;
 
+    @Resource
+    private BizBaseAreaService bizBaseAreaService;
+
 
     @RabbitListener(queues = Const.QUEUE_SYNC_SYS_CONFIG)
     @RabbitHandler
@@ -40,19 +45,22 @@ public class SysBaseConfigListener {
         System.out.println("======================收到基础配置信息同步"+params);
         //查询牧场表是否有数据
         String farmCode = params.get("farmCode");
-        String chipId = params.get("chipId");
-        String deviceCode = params.get("deviceCode");
+        String areaName = params.get("areaCode");
+        String substring = areaName.substring(areaName.length() - 6);
+
+        BizBaseArea bizBaseArea = bizBaseAreaService.queryAreaName(substring);
+
         String bizFarmByFarmCode = bizFarmService.getBizFarmByFarmCode(farmCode);
         System.out.println("-------------------"+bizFarmByFarmCode);
         if (StringUtils.isBlank(bizFarmByFarmCode)){
             //插入数据
-            bizFarmService.save(params.get("areaName"),farmCode,"","","",params.get("areaName"));
+            bizFarmService.save(params.get("farmName"),farmCode,"","","",bizBaseArea.getAreaName());
             insertRegistration(params);
         }else {
             System.out.println("******************查到了数据******");
             BizFarm bizFarm = bizFarmService.getBizFarm(farmCode);
             //1、更新农场表
-            bizFarmService.edit(bizFarm.getId(),params.get("areaName"),farmCode,"","","",params.get("areaName"));
+            bizFarmService.edit(bizFarm.getId(),params.get("farmName"),farmCode,"","","",bizBaseArea.getAreaName());
             //2、更新注册表中数据
             insertRegistration(params);
         }
@@ -72,7 +80,7 @@ public class SysBaseConfigListener {
         List<BizDeviceRegister> oneByChipIdAndDeviceCode = bizDeviceRegisterService.getOneByChipIdAndDeviceCode(chipId, deviceCode);
         if (null == oneByChipIdAndDeviceCode || oneByChipIdAndDeviceCode.size() == 0){
             //插入数据到注册表中
-            bizDeviceRegisterService.add(params.get("areaName"),farmCode,chipId,deviceCode,params.get("ip"),params.get("port"),"");
+            bizDeviceRegisterService.add(params.get("farmName"),farmCode,chipId,deviceCode,params.get("ip"),params.get("port"),"");
         }else {
             //更新注册表
             BizDeviceRegister bizDeviceRegister = oneByChipIdAndDeviceCode.get(0);

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

@@ -14,4 +14,6 @@ public interface BizBaseAreaService {
      Result treeList();
 
      BizBaseArea queryAreaCodeByAreaName(String areaName);
+
+     BizBaseArea queryAreaName(String areaCode);
 }

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

@@ -24,4 +24,6 @@ public interface BizBaseStageService extends IService<BizBaseStage> {
     Result updateBizBaseStage(Map<String, String> param);
 
     Result listBizBaseStage(Map<String, String> param);
+
+    Result getDataById(String id);
 }

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

@@ -3,7 +3,6 @@ package com.huimv.center.service;
 import com.huimv.center.pojo.BizFarm;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
-
 import java.text.ParseException;
 
 /**

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

@@ -71,6 +71,17 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
         return bizBaseAreas.get(0);
     }
 
+    @Override
+    public BizBaseArea queryAreaName(String areaCode) {
+        QueryWrapper<BizBaseArea> bizBaseAreaQueryWrapper = new QueryWrapper<>();
+        bizBaseAreaQueryWrapper.eq("area_code",areaCode);
+        List<BizBaseArea> bizBaseAreas = bizBaseAreaMapper.selectList(bizBaseAreaQueryWrapper);
+        if (bizBaseAreas == null ||bizBaseAreas.size()==0){
+            return new BizBaseArea();
+        }
+        return bizBaseAreas.get(0);
+    }
+
     /**
      * 查询结果 转换成树形结构
      * @param bizBaseAreas 原始数据

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizBaseStage;
 import com.huimv.center.mapper.BizBaseStageMapper;
-import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.service.BizBaseStageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.Result;
@@ -15,7 +14,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * <p>
@@ -73,4 +71,9 @@ public class BizBaseStageServiceImpl extends ServiceImpl<BizBaseStageMapper, Biz
         Page<BizBaseStage> bizBaseStagePage = bizBaseStageMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,bizBaseStagePage);
     }
+
+    @Override
+    public Result getDataById(String id) {
+        return new Result(ResultCode.SUCCESS,bizBaseStageMapper.selectById(id));
+    }
 }

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -13,6 +13,7 @@ com/huimv/center/controller/BizDeviceUnregisteredFlowController.class
 com/huimv/center/mapper/BizDeviceRegisteredFlowMapper.class
 com/huimv/center/utils/Const.class
 com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.class
+com/huimv/center/pojo/BizBaseStage.class
 com/huimv/center/controller/BizDeviceRegisterController.class
 com/huimv/center/mapper/BizDeviceUnregisteredFlowMapper.class
 com/huimv/center/utils/Constant$CloudService.class
@@ -20,6 +21,7 @@ com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.class
 com/huimv/center/controller/BizFarmController.class
 com/huimv/center/service/impl/BizFarmServiceImpl.class
 com/huimv/center/server/RegisterServerHandler2.class
+com/huimv/center/service/BizBaseStageService.class
 com/huimv/center/mapper/BizDeviceUnregisteredMapper.class
 com/huimv/center/service/BizDeviceUnregisteredService.class
 com/huimv/center/controller/BizDeviceUnregisteredController.class
@@ -53,14 +55,17 @@ com/huimv/center/pojo/BizBaseArea.class
 com/huimv/center/mapper/BizDeviceAnswerFlowMapper.class
 com/huimv/center/mapper/BizTransferHistoryMapper.class
 com/huimv/center/controller/BizDeviceRegisteredFlowController.class
+com/huimv/center/mapper/BizBaseStageMapper.class
 com/huimv/center/server/RegisterServer$1.class
 com/huimv/center/vo/BaseAreaVo.class
 com/huimv/center/controller/BizBaseAreaController.class
 com/huimv/center/service/BizDeviceRegisterService.class
 com/huimv/center/service/impl/BizDeviceAnswerFlowServiceImpl.class
 com/huimv/center/result/RRException.class
+com/huimv/center/controller/BizBaseStageController.class
 com/huimv/center/service/impl/BizRawDataServiceImpl.class
 com/huimv/center/utils/SQLFilter.class
+com/huimv/center/service/impl/BizBaseStageServiceImpl.class
 com/huimv/center/utils/ResultUtil.class
 com/huimv/center/service/impl/BizBaseAreaServiceImpl.class
 com/huimv/center/service/BizDeviceUnregisteredFlowService.class

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -10,6 +10,7 @@
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/vo/BaseAreaVo.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizTransferHistoryMapper.java
+/Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/BizBaseStageService.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceUnregisteredMapper.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizTransferHistory.java
@@ -35,6 +36,7 @@
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/BizBaseAreaService.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredService.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/server/RegisterServerHandler.java
+/Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizBaseStageController.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizFarmMapper.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceUnregistered.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/utils/Const.java
@@ -46,6 +48,7 @@
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisterController.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/listener/DeviceListener.java
+/Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizBaseStageMapper.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceRegisterMapper.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/utils/DateUtil.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/utils/RegexUtil.java
@@ -55,8 +58,10 @@
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/listener/SysBaseConfigListener.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceUnregisteredFlow.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/server/RegisterServer2.java
+/Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizBaseStage.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/BizTransferHistoryService.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizRawDataServiceImpl.java
+/Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizBaseStageServiceImpl.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizRawData.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizBaseArea.java
 /Users/a1/Desktop/new-code/registration.center/registration-center/src/main/java/com/huimv/center/result/RRException.java