Merge branch 'develop_dl' of F:\myWorkspace\amosBootBiz with conflicts.

.idea/compiler.xml

@@ -7,55 +7,56 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="amos-boot-module-equip-biz" />
+        <module name="amos-boot-module-latentdanger-biz" />
+        <module name="amos-boot-module-precontrol-biz" />
         <module name="amos-boot-utils-video" />
-        <module name="amos-boot-system-fas" />
+        <module name="amos-boot-module-supervision-api" />
         <module name="amos-boot-module-maintenance-biz" />
-        <module name="amos-boot-module-knowledgebase-api" />
+        <module name="amos-boot-system-fas" />
+        <module name="amos-boot-module-avic-biz" />
         <module name="amos-boot-module-fas-api" />
-        <module name="amos-boot-module-equip-api" />
-        <module name="amos-boot-module-knowledgebase-biz" />
-        <module name="amos-boot-module-maintenance-api" />
-        <module name="amos-boot-system-ccs" />
-        <module name="amos-boot-biz-common" />
-        <module name="amos-boot-module-common-biz" />
-        <module name="amos-boot-module-common-api" />
-        <module name="amos-boot-data-alarm" />
-        <module name="amos-boot-module-precontrol-biz" />
-        <module name="amos-boot-data-common" />
-        <module name="amos-boot-module-precontrol-api" />
-        <module name="amos-boot-module-jcs-biz" />
-        <module name="amos-boot-module-ccs-biz" />
+        <module name="amos-boot-system-equip" />
         <module name="amos-boot-module-patrol-api" />
-        <module name="amos-boot-system-knowledgebase" />
-        <module name="amos-boot-system-supervision" />
-        <module name="amos-boot-module-ccs-api" />
-        <module name="amos-boot-module-patrol-biz" />
         <module name="amos-boot-system-maintenance" />
-        <module name="amos-boot-system-jcs" />
+        <module name="amos-boot-module-equip-biz" />
+        <module name="amos-boot-module-command-biz" />
+        <module name="amos-boot-system-latentdanger" />
         <module name="amos-boot-data-openapi" />
-        <module name="amos-boot-module-jcs-api" />
-        <module name="amos-boot-cloud-gateway" />
-        <module name="amos-boot-module-latentdanger-biz" />
+        <module name="amos-boot-utils-speech" />
         <module name="amos-boot-module-supervision-biz" />
-        <module name="amos-boot-module-latentdanger-api" />
-        <module name="amos-boot-utils-jpush" />
-        <module name="amos-boot-module-tzs-api" />
-        <module name="amos-boot-system-patrol" />
+        <module name="amos-boot-system-supervision" />
         <module name="amos-boot-module-tzs-biz" />
-        <module name="amos-boot-system-latentdanger" />
         <module name="amos-boot-system-precontrol" />
-        <module name="amos-boot-module-supervision-api" />
+        <module name="amos-boot-module-fas-biz" />
+        <module name="amos-boot-module-patrol-biz" />
+        <module name="amos-boot-module-ccs-biz" />
+        <module name="amos-boot-module-equip-api" />
         <module name="amos-boot-core" />
-        <module name="amos-boot-module-avic-biz" />
-        <module name="amos-boot-utils-speech" />
-        <module name="amos-boot-module-command-api" />
+        <module name="amos-boot-utils-message" />
+        <module name="amos-boot-module-ccs-api" />
+        <module name="amos-boot-module-knowledgebase-api" />
+        <module name="amos-boot-system-jcs" />
+        <module name="amos-boot-data-alarm" />
+        <module name="amos-boot-module-common-biz" />
+        <module name="amos-boot-module-knowledgebase-biz" />
+        <module name="amos-boot-cloud-gateway" />
+        <module name="amos-boot-module-latentdanger-api" />
         <module name="amos-boot-module-avic-api" />
+        <module name="amos-boot-system-knowledgebase" />
+        <module name="amos-boot-module-tzs-api" />
+        <module name="amos-boot-module-jcs-biz" />
+        <module name="amos-boot-system-ccs" />
         <module name="amos-boot-data-equip" />
-        <module name="amos-boot-utils-message" />
-        <module name="amos-boot-module-fas-biz" />
-        <module name="amos-boot-module-command-biz" />
-        <module name="amos-boot-system-equip" />
+        <module name="amos-boot-module-jcs-api" />
+        <module name="amos-boot-utils-jpush" />
+        <module name="amos-boot-module-maintenance-api" />
+        <module name="amos-boot-module-command-api" />
+        <module name="amos-boot-biz-common" />
+        <module name="amos-boot-module-precontrol-api" />
+        <module name="amos-boot-data-common" />
+        <module name="amos-boot-module-common-api" />
+        <module name="amos-boot-utils-adpter" />
+        <module name="amos-boot-system-patrol" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -110,7 +111,8 @@
       <module name="amos-boot-system-patrol" options="-parameters" />
       <module name="amos-boot-system-precontrol" options="-parameters" />
       <module name="amos-boot-system-supervision" options="-parameters" />
-      <module name="amos-boot-system-tzs" options="" />
+      <module name="amos-boot-system-tzs" options="-parameters" />
+      <module name="amos-boot-utils-adpter" options="-parameters" />
       <module name="amos-boot-utils-jpush" options="-parameters" />
       <module name="amos-boot-utils-message" options="-parameters" />
       <module name="amos-boot-utils-speech" options="-parameters" />

.idea/encodings.xml

@@ -7,14 +7,14 @@
     <file url="file://$PROJECT_DIR$/amos-boot-core" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-data" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-accessapi" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-alarm" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-alarm/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-common" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-equip" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-equip/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-openapi" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-data/amos-boot-data-openapi/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-data/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-data/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-jcs-system" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-cloud-gateway" charset="UTF-8" />
@@ -34,6 +34,7 @@
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-fas-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-knowledgebase-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api" charset="UTF-8" />
@@ -47,8 +48,6 @@
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java" charset="UTF-8" />
@@ -64,6 +63,7 @@
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-kgd-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz" charset="UTF-8" />
@@ -77,10 +77,9 @@
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-module/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-module/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-cas" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-cas/amos-boot-module-cas-api" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-cas/amos-boot-module-cas-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-ccs" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-ccs/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-equip" charset="UTF-8" />
@@ -89,6 +88,7 @@
     <file url="file://$PROJECT_DIR$/amos-boot-system-fas/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-jcs" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-jcs/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-kgd" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-knowledgebase" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-knowledgebase/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-latentdanger" charset="UTF-8" />
@@ -101,25 +101,23 @@
     <file url="file://$PROJECT_DIR$/amos-boot-system-precontrol/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-supervision" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-supervision/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-tdc" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-tdc/amos-boot-module-tdc-api" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-system-tdc/amos-boot-module-tdc-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-tzs" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-api" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-biz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-system-tzs/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-system-tzs/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-tzs-system" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-adpter" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-jpush" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-jpush/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-message" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-message/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-speech" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-speech/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-video" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/amos-boot-utils/amos-boot-utils-video/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-utils/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/amos-boot-utils/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file

.idea/misc.xml

@@ -9,8 +9,6 @@
     </option>
     <option name="ignoredFiles">
       <set>
-        <option value="$PROJECT_DIR$/../../../Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-api/pom.xml" />
-        <option value="$PROJECT_DIR$/../../../Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml" />
         <option value="$PROJECT_DIR$/amos-boot-data/amos-boot-data-accessapi/pom.xml" />
         <option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/pom.xml" />
         <option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-kgd-biz/pom.xml" />

amos-boot-system-equip/src/main/resources/application.properties

-spring.application.name=AMOS-EQUIPMANAGE
+spring.application.name=AMOS-EQUIPMANAGE-xxz
 server.servlet.context-path=/equip
 server.port=8100
 
@@ -25,7 +25,7 @@ pagehelper.support-methods-arguments=true
 spring.main.allow-bean-definition-overriding=true
 #liquibase
 spring.liquibase.change-log=classpath:/changelog/changelog-master.xml
-spring.liquibase.enabled=false
+spring.liquibase.enabled=true
 
 #\u4E0A\u4F20\u6587\u4EF6\u8BBE\u7F6E
 spring.servlet.multipart.maxFileSize=100MB

amos-boot-utils/amos-boot-utils-message/src/main/java/com/yeejoin/amos/message/kafka/KafkaConsumerService.java

@@ -75,32 +75,32 @@ public class KafkaConsumerService {
      * @param consumerRecords messages
      * @param ack             ack
      */
-    @KafkaListener(id = "provinceMessage", groupId = "province", topics = "#{'${kafka.topics}'.split(',')}")
-    public void listen(List<ConsumerRecord<String, String>> consumerRecords, Acknowledgment ack) {
-        try {
-            if (isZxj) {
-                for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
-                    Optional<?> kafkaMessage = Optional.ofNullable(consumerRecord.value());
-                    if (kafkaMessage.isPresent()) {
-                        JSONObject messageObj = JSONObject.fromObject(kafkaMessage.get());
-                        String type = messageObj.optString(TYPE);
-                        String table = messageObj.optString(TABLE);
-                        if (Arrays.asList(INSERT, UPDATE).contains(type) && DBTableTypeEnum.have(table) != null) {
-                            JSONObject data = (JSONObject) messageObj.getJSONArray(DATA).get(0);
-                            data.put(DB_TYPE, type);
-                            data.put(TABLE, table);
-                            emqKeeper.getMqttClient().publish(PROVINCE_MQTT_TOPIC, data.toString().getBytes(StandardCharsets.UTF_8), 0, false);
-                            log.info("kafka消费province消息{}", messageObj);
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("kafka失败，当前失败的批次: data:{}, {}", consumerRecords, e);
-        } finally {
-            ack.acknowledge();
-        }
-    }
+//    @KafkaListener(id = "provinceMessage", groupId = "province", topics = "#{'${kafka.topics}'.split(',')}")
+//    public void listen(List<ConsumerRecord<String, String>> consumerRecords, Acknowledgment ack) {
+//        try {
+//            if (isZxj) {
+//                for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
+//                    Optional<?> kafkaMessage = Optional.ofNullable(consumerRecord.value());
+//                    if (kafkaMessage.isPresent()) {
+//                        JSONObject messageObj = JSONObject.fromObject(kafkaMessage.get());
+//                        String type = messageObj.optString(TYPE);
+//                        String table = messageObj.optString(TABLE);
+//                        if (Arrays.asList(INSERT, UPDATE).contains(type) && DBTableTypeEnum.have(table) != null) {
+//                            JSONObject data = (JSONObject) messageObj.getJSONArray(DATA).get(0);
+//                            data.put(DB_TYPE, type);
+//                            data.put(TABLE, table);
+//                            emqKeeper.getMqttClient().publish(PROVINCE_MQTT_TOPIC, data.toString().getBytes(StandardCharsets.UTF_8), 0, false);
+//                            log.info("kafka消费province消息{}", messageObj);
+//                        }
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("kafka失败，当前失败的批次: data:{}, {}", consumerRecords, e);
+//        } finally {
+//            ack.acknowledge();
+//        }
+//    }
 
     /**
      * 转发苏州，绍兴换流站Kafka数据对emq