diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 5ec5295..172042e 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,44 +1,3 @@ Manifest-Version: 1.0 -Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa - lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0. - 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2. - 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0. - jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni - mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging - -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15. - jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons- - httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm - ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a - op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j - ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j - dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o - jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation - s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo - -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression- - 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java- - sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar - gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s - dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2. - 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring - -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2 - .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega - cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1. - 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo - gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp - ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a - nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka - -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util- - 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4. - 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F - inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j - ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s - pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja - va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso - n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j- - 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2. - jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3 - .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1. - 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer - -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar Main-Class: org.well.mysql.sink.WellSink diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 5ec5295..172042e 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,44 +1,3 @@ Manifest-Version: 1.0 -Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa - lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0. - 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2. - 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0. - jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni - mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging - -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15. - jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons- - httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm - ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a - op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j - ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j - dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o - jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation - s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo - -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression- - 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java- - sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar - gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s - dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2. - 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring - -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2 - .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega - cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1. - 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo - gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp - ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a - nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka - -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util- - 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4. - 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F - inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j - ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s - pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja - va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso - n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j- - 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2. - jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3 - .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1. - 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer - -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar Main-Class: org.well.mysql.sink.WellSink diff --git a/META-INF/application.xml b/META-INF/application.xml new file mode 100644 index 0000000..8533088 --- /dev/null +++ b/META-INF/application.xml @@ -0,0 +1,7 @@ + + + + diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 5ec5295..172042e 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,44 +1,3 @@ Manifest-Version: 1.0 -Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa - lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0. - 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2. - 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0. - jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni - mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging - -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15. - jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons- - httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm - ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a - op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j - ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j - dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o - jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation - s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo - -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression- - 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java- - sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar - gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s - dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2. - 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring - -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2 - .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega - cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1. - 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo - gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp - ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a - nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka - -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util- - 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4. - 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F - inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j - ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s - pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja - va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso - n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j- - 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2. - jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3 - .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1. - 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer - -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar Main-Class: org.well.mysql.sink.WellSink diff --git a/META-INF/application.xml b/META-INF/application.xml new file mode 100644 index 0000000..8533088 --- /dev/null +++ b/META-INF/application.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 35d7ddb..1e93e37 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -139,7 +139,6 @@ // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; temp="{\"mType\":\"Event\",\"devType\":\"WellPlus\",\"devCode\":\"412019080025\",\"mBody\":{\"eventType\":[\"WellPusOpenAlarm\"],\"logTime\":\"20220406154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; // temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; - // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; // temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 5ec5295..172042e 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,44 +1,3 @@ Manifest-Version: 1.0 -Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa - lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0. - 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2. - 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0. - jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni - mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging - -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15. - jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons- - httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm - ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a - op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j - ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j - dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o - jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation - s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo - -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression- - 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java- - sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar - gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s - dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2. - 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring - -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2 - .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega - cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1. - 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo - gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp - ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a - nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka - -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util- - 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4. - 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F - inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j - ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s - pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja - va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso - n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j- - 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2. - jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3 - .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1. - 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer - -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar Main-Class: org.well.mysql.sink.WellSink diff --git a/META-INF/application.xml b/META-INF/application.xml new file mode 100644 index 0000000..8533088 --- /dev/null +++ b/META-INF/application.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 35d7ddb..1e93e37 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -139,7 +139,6 @@ // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; temp="{\"mType\":\"Event\",\"devType\":\"WellPlus\",\"devCode\":\"412019080025\",\"mBody\":{\"eventType\":[\"WellPusOpenAlarm\"],\"logTime\":\"20220406154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; // temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; - // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; // temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; diff --git a/src/main/java/org/well/well/manager/CommercialGasManager.java b/src/main/java/org/well/well/manager/CommercialGasManager.java index 732fb08..bc74f1c 100644 --- a/src/main/java/org/well/well/manager/CommercialGasManager.java +++ b/src/main/java/org/well/well/manager/CommercialGasManager.java @@ -78,10 +78,12 @@ try { String dataValue = ((JSONObject) jsonArray.get(i)).getString("dataValue"); String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); - String snr = ((JSONObject) jsonArray.get(i)).getString("snr"); - String pci = ((JSONObject) jsonArray.get(i)).getString("pci"); - String rsrp = ((JSONObject) jsonArray.get(i)).getString("rsrp"); - + String snr = "", pci = "", rsrp = ""; + if (((JSONObject) jsonArray.get(i)).containsKey("snr")) { + snr = ((JSONObject) jsonArray.get(i)).getString("snr"); + pci = ((JSONObject) jsonArray.get(i)).getString("pci"); + rsrp = ((JSONObject) jsonArray.get(i)).getString("rsrp"); + } dataValue = String.format("%.4f", Double.valueOf(dataValue)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), dataValue, cell, upTime, snr, pci, rsrp);//存储采集数据 diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 5ec5295..172042e 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,44 +1,3 @@ Manifest-Version: 1.0 -Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa - lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0. - 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2. - 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0. - jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni - mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging - -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15. - jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons- - httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm - ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a - op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j - ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j - dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o - jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation - s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo - -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression- - 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java- - sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar - gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s - dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2. - 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring - -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2 - .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega - cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1. - 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo - gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp - ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a - nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka - -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util- - 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4. - 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F - inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j - ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s - pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja - va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso - n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j- - 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2. - jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3 - .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1. - 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer - -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar Main-Class: org.well.mysql.sink.WellSink diff --git a/META-INF/application.xml b/META-INF/application.xml new file mode 100644 index 0000000..8533088 --- /dev/null +++ b/META-INF/application.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 35d7ddb..1e93e37 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -139,7 +139,6 @@ // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; temp="{\"mType\":\"Event\",\"devType\":\"WellPlus\",\"devCode\":\"412019080025\",\"mBody\":{\"eventType\":[\"WellPusOpenAlarm\"],\"logTime\":\"20220406154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; // temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; - // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; // temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; diff --git a/src/main/java/org/well/well/manager/CommercialGasManager.java b/src/main/java/org/well/well/manager/CommercialGasManager.java index 732fb08..bc74f1c 100644 --- a/src/main/java/org/well/well/manager/CommercialGasManager.java +++ b/src/main/java/org/well/well/manager/CommercialGasManager.java @@ -78,10 +78,12 @@ try { String dataValue = ((JSONObject) jsonArray.get(i)).getString("dataValue"); String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); - String snr = ((JSONObject) jsonArray.get(i)).getString("snr"); - String pci = ((JSONObject) jsonArray.get(i)).getString("pci"); - String rsrp = ((JSONObject) jsonArray.get(i)).getString("rsrp"); - + String snr = "", pci = "", rsrp = ""; + if (((JSONObject) jsonArray.get(i)).containsKey("snr")) { + snr = ((JSONObject) jsonArray.get(i)).getString("snr"); + pci = ((JSONObject) jsonArray.get(i)).getString("pci"); + rsrp = ((JSONObject) jsonArray.get(i)).getString("rsrp"); + } dataValue = String.format("%.4f", Double.valueOf(dataValue)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), dataValue, cell, upTime, snr, pci, rsrp);//存储采集数据 diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 6acc0e8..8ad6d7c 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 0 +bootstrap.groupid = 3 # ============================================================================ # 告警、工单推送地址