diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/target/classes/wellSensor/applicationContex-quartz.xml b/target/classes/wellSensor/applicationContex-quartz.xml deleted file mode 100644 index 55bbc86..0000000 --- a/target/classes/wellSensor/applicationContex-quartz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/target/classes/wellSensor/applicationContex-quartz.xml b/target/classes/wellSensor/applicationContex-quartz.xml deleted file mode 100644 index 55bbc86..0000000 --- a/target/classes/wellSensor/applicationContex-quartz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-cache.xml b/target/classes/wellSensor/applicationContext-cache.xml deleted file mode 100644 index a6a3bd1..0000000 --- a/target/classes/wellSensor/applicationContext-cache.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/target/classes/wellSensor/applicationContex-quartz.xml b/target/classes/wellSensor/applicationContex-quartz.xml deleted file mode 100644 index 55bbc86..0000000 --- a/target/classes/wellSensor/applicationContex-quartz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-cache.xml b/target/classes/wellSensor/applicationContext-cache.xml deleted file mode 100644 index a6a3bd1..0000000 --- a/target/classes/wellSensor/applicationContext-cache.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-hibernate.xml b/target/classes/wellSensor/applicationContext-hibernate.xml deleted file mode 100644 index ea3b888..0000000 --- a/target/classes/wellSensor/applicationContext-hibernate.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.hibernate.dialect.MySQL5Dialect - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/target/classes/wellSensor/applicationContex-quartz.xml b/target/classes/wellSensor/applicationContex-quartz.xml deleted file mode 100644 index 55bbc86..0000000 --- a/target/classes/wellSensor/applicationContex-quartz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-cache.xml b/target/classes/wellSensor/applicationContext-cache.xml deleted file mode 100644 index a6a3bd1..0000000 --- a/target/classes/wellSensor/applicationContext-cache.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-hibernate.xml b/target/classes/wellSensor/applicationContext-hibernate.xml deleted file mode 100644 index ea3b888..0000000 --- a/target/classes/wellSensor/applicationContext-hibernate.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.hibernate.dialect.MySQL5Dialect - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/wellSensor/applicationContext-jdbc.xml b/target/classes/wellSensor/applicationContext-jdbc.xml deleted file mode 100644 index 6cdcc6f..0000000 --- a/target/classes/wellSensor/applicationContext-jdbc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/target/classes/wellSensor/applicationContex-quartz.xml b/target/classes/wellSensor/applicationContex-quartz.xml deleted file mode 100644 index 55bbc86..0000000 --- a/target/classes/wellSensor/applicationContex-quartz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-cache.xml b/target/classes/wellSensor/applicationContext-cache.xml deleted file mode 100644 index a6a3bd1..0000000 --- a/target/classes/wellSensor/applicationContext-cache.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-hibernate.xml b/target/classes/wellSensor/applicationContext-hibernate.xml deleted file mode 100644 index ea3b888..0000000 --- a/target/classes/wellSensor/applicationContext-hibernate.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.hibernate.dialect.MySQL5Dialect - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/wellSensor/applicationContext-jdbc.xml b/target/classes/wellSensor/applicationContext-jdbc.xml deleted file mode 100644 index 6cdcc6f..0000000 --- a/target/classes/wellSensor/applicationContext-jdbc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/target/classes/wellSensor/applicationContext-springmvc.xml b/target/classes/wellSensor/applicationContext-springmvc.xml deleted file mode 100644 index 390b13f..0000000 --- a/target/classes/wellSensor/applicationContext-springmvc.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 172042e..cf86e78 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -1,3 +1,36 @@ Manifest-Version: 1.0 Main-Class: org.well.mysql.sink.WellSink +Class-Path: spring-beans-4.0.6.RELEASE.jar javax.servlet-api-3.0.1.jar s + lf4j-api-1.6.1.jar activemq-openwire-legacy-5.14.5.jar validation-api-1 + .1.0.Final.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar ezmorph-1.0. + 6.jar geronimo-jta_1.0.1B_spec-1.0.1.jar concurrentlinkedhashmap-lru-1. + 2_jdk5.jar spring-aop-4.0.6.RELEASE.jar jstl-1.2.jar xml-apis-1.0.b2.ja + r commons-compiler-2.7.6.jar commons-dbcp-1.4.jar activemq-broker-5.14. + 5.jar snappy-java-1.1.2.6.jar spring-jms-3.2.8.RELEASE.jar aopalliance- + 1.0.jar dom4j-1.6.1.jar classmate-1.0.0.jar spring-web-4.0.6.RELEASE.ja + r antlr-2.7.7.jar commons-pool-1.5.4.jar lz4-1.3.0.jar protobuf-java-2. + 4.1.jar hibernate-jpa-2.1-api-1.0.0.Final.jar javassist-3.18.1-GA.jar s + pring-expression-4.0.6.RELEASE.jar hutool-core-4.6.0.jar commons-collec + tions-3.2.1.jar orika-core-1.4.5.jar gson-2.6.jar spring-messaging-4.3. + 3.RELEASE.jar janino-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp + ring-webmvc-4.0.6.RELEASE.jar jboss-logging-3.1.3.GA.jar geronimo-jms_1 + .1_spec-1.1.1.jar jackson-databind-2.4.2.jar hibernate-commons-annotati + ons-4.0.5.Final.jar spring-orm-4.0.6.RELEASE.jar hibernate-validator-5. + 1.2.Final.jar log4jdbc-remix-0.2.7.jar logback-core-1.1.2.jar hibernate + -core-4.3.6.Final.jar paranamer-2.3.jar jandex-1.1.0.Final.jar spring-c + ontext-support-4.0.6.RELEASE.jar json-lib-2.4-jdk15.jar spring-core-4.0 + .6.RELEASE.jar jackson-jaxrs-base-2.4.2.jar spring-kafka-1.1.1.RELEASE. + jar ojdbc6-11.1.0.7.0.jar hutool-captcha-4.6.0.jar commons-io-2.4.jar s + pring-tx-4.0.6.RELEASE.jar commons-lang3-3.3.2.jar xbean-spring-4.2.jar + commons-httpclient-3.1.jar commons-codec-1.9.jar jboss-logging-annotat + ions-1.2.0.Beta1.jar hawtbuf-1.11.jar commons-fileupload-1.3.1.jar jans + i-1.11.jar activemq-jms-pool-5.14.5.jar jackson-module-jaxb-annotations + -2.4.2.jar mysql-connector-java-8.0.27.jar activemq-spring-5.14.5.jar s + pring-jdbc-4.0.6.RELEASE.jar fastjson-1.1.15.jar spring-context-4.0.6.R + ELEASE.jar commons-lang-2.5.jar logback-classic-1.1.2.jar jackson-core- + 2.4.2.jar commons-beanutils-1.9.2.jar java-sizeof-0.0.4.jar kafka-clien + ts-0.11.0.1.jar activemq-pool-5.14.5.jar activemq-client-5.14.5.jar spr + ing-retry-1.1.3.RELEASE.jar jackson-annotations-2.4.0.jar jboss-transac + tion-api_1.2_spec-1.0.0.Final.jar commons-pool2-2.4.2.jar commons-loggi + ng-1.1.1.jar diff --git a/pom.xml b/pom.xml index d83c03a..c65a1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,15 @@ UTF-8 - - org.apache.flume - flume-ng-core - + + + + - - org.apache.flume - flume-ng-configuration - + + + + @@ -207,21 +207,21 @@ - - org.slf4j - slf4j-api - 1.7.7 - - - org.slf4j - jcl-over-slf4j - 1.7.7 - - - org.slf4j - jul-to-slf4j - 1.7.7 - + + + + + + + + + + + + + + + ch.qos.logback logback-classic @@ -258,8 +258,18 @@ spring-jms 3.2.8.RELEASE - - + + + javax.servlet + javax.servlet-api + 3.0.1 + + + com.google.code.gson + gson + 2.6 + + org.apache.kafka diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 689734b..0000000 --- a/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jul-to-slf4j-1.7.7.jar flume-ng-core-1.4.0.jar hibernate-c - ommons-annotations-4.0.5.Final.jar snappy-java-1.1.2.6.jar hibernate- - validator-5.1.2.Final.jar spring-context-support-4.0.6.RELEASE.jar co - mmons-collections-3.2.1.jar hibernate-core-4.3.6.Final.jar spring-con - text-4.0.6.RELEASE.jar activemq-openwire-legacy-5.14.5.jar java-sizeo - f-0.0.4.jar jackson-jaxrs-base-2.4.2.jar libthrift-0.7.0.jar hutool-c - ore-4.6.0.jar commons-io-2.4.jar hibernate-jpa-2.1-api-1.0.0.Final.ja - r spring-tx-4.0.6.RELEASE.jar commons-cli-1.2.jar jackson-annotations - -2.4.0.jar spring-orm-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar activ - emq-spring-5.14.5.jar jetty-util-6.1.26.jar spring-messaging-4.3.3.RE - LEASE.jar commons-dbcp-1.4.jar gson-2.2.2.jar activemq-jms-pool-5.14. - 5.jar jackson-mapper-asl-1.9.3.jar spring-retry-1.1.3.RELEASE.jar vel - ocity-1.7.jar spring-webmvc-4.0.6.RELEASE.jar commons-fileupload-1.3. - 1.jar activemq-pool-5.14.5.jar spring-jdbc-4.0.6.RELEASE.jar mina-cor - e-2.0.4.jar commons-lang3-3.3.2.jar commons-httpclient-3.1.jar active - mq-broker-5.14.5.jar hawtbuf-1.11.jar validation-api-1.1.0.Final.jar - protobuf-java-2.4.1.jar ojdbc6-11.1.0.7.0.jar jansi-1.11.jar fastjson - -1.1.15.jar commons-codec-1.9.jar paranamer-2.3.jar avro-1.7.3.jar av - ro-ipc-1.7.3.jar classmate-1.0.0.jar jcl-over-slf4j-1.7.7.jar spring- - expression-4.0.6.RELEASE.jar commons-pool2-2.4.2.jar aopalliance-1.0. - jar commons-lang-2.5.jar json-lib-2.4-jdk15.jar kafka-clients-0.11.0. - 1.jar slf4j-api-1.7.7.jar jackson-core-asl-1.9.3.jar geronimo-jms_1.1 - _spec-1.1.1.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar janino-2. - 7.6.jar jackson-module-jaxb-annotations-2.4.2.jar servlet-api-2.5-201 - 10124.jar orika-core-1.4.5.jar netty-3.4.0.Final.jar geronimo-jta_1.0 - .1B_spec-1.0.1.jar mysql-connector-java-8.0.27.jar spring-aop-4.0.6.R - ELEASE.jar jackson-databind-2.4.2.jar antlr-2.7.7.jar jsr305-1.3.9.ja - r jetty-6.1.26.jar ezmorph-1.0.6.jar log4j-1.2.16.jar guava-10.0.1.ja - r jackson-jaxrs-json-provider-2.4.2.jar concurrentlinkedhashmap-lru-1 - .2_jdk5.jar spring-web-4.0.6.RELEASE.jar log4jdbc-remix-0.2.7.jar spr - ing-core-4.0.6.RELEASE.jar commons-compiler-2.7.6.jar flume-ng-config - uration-1.4.0.jar logback-core-1.1.2.jar spring-kafka-1.1.1.RELEASE.j - ar joda-time-2.1.jar jstl-1.2.jar flume-ng-sdk-1.4.0.jar jboss-transa - ction-api_1.2_spec-1.0.0.Final.jar logback-classic-1.1.2.jar commons- - logging-1.1.1.jar httpcore-4.2.1.jar javassist-3.18.1-GA.jar jackson- - core-2.4.2.jar jboss-logging-annotations-1.2.0.Beta1.jar xbean-spring - -4.2.jar commons-beanutils-1.9.2.jar jboss-logging-3.1.3.GA.jar sprin - g-jms-3.2.8.RELEASE.jar hutool-captcha-4.6.0.jar activemq-client-5.14 - .5.jar httpclient-4.2.1.jar spring-beans-4.0.6.RELEASE.jar xml-apis-1 - .0.b2.jar commons-pool-1.5.4.jar jandex-1.1.0.Final.jar dom4j-1.6.1.j - ar lz4-1.3.0.jar -Main-Class: org.well.mysql.sink.WellSink - diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 1e93e37..ceb6ebe 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -17,96 +17,87 @@ */ package org.well.mysql.sink; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import org.apache.flume.*; -import org.apache.flume.conf.Configurable; -import org.apache.flume.sink.AbstractSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.well.well.base.AbstractResponse; -import org.well.well.util.ResponseResolver; -import java.util.List; +//public class WellSink extends AbstractSink implements Configurable { +public class WellSink { -public class WellSink extends AbstractSink implements Configurable { - - private Logger LOG = LoggerFactory.getLogger(WellSink.class); - private int batchSize; - private ClassPathXmlApplicationContext ac = null; - public WellSink() { - LOG.info("wellMysqlSink start..."); - } - public void configure(Context context) { - String s[] = System.getProperty("java.class.path").split(";"); - for (String string : s) { - System.out.println("**********************"+string+"************************"); - } - ac = new ClassPathXmlApplicationContext( - new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 1000); - } - - @Override - public void start() { - super.start(); - LOG.info("--------wellMysqlSink start-------"); - System.out.println("--------wellMysqlSink start-------"); - } - - @Override - public void stop() { - super.stop(); - LOG.info("--------wellMysqlSink stop-------"); - } - - public Status process() throws EventDeliveryException { - Status result = Status.READY; - Channel channel = getChannel(); - Transaction transaction = channel.getTransaction(); - Event event; - String content; - List actions = Lists.newArrayList(); - transaction.begin(); - try { - for (int i = 0; i < batchSize; i++) { - event = channel.take(); - if (event != null) { - content = new String(event.getBody()); - actions.add(content); - } else { - result = Status.BACKOFF; - break; - } - } - if (actions.size() > 0) { - for (String temp : actions) { - LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); - AbstractResponse resp = ResponseResolver.makeResponse(temp); - if (resp == null) continue; - resp.setAc(ac); - resp.process(temp);//对应的消息处理 - LOG.info("--------wellMysqlSink存库处理完！------"); - } - } - transaction.commit(); - } catch (Throwable e) { - try { -// transaction.rollback(); - transaction.commit(); - } catch (Exception e2) { - LOG.error("Exception in rollback. Rollback might not have been" + - "successful.", e2); - } - LOG.error("Failed to commit transaction." + - "Transaction rolled back.", e); - Throwables.propagate(e); - } finally { - transaction.close(); - } - return result; - } +// private Logger LOG = LoggerFactory.getLogger(WellSink.class); +// private int batchSize; +// private ClassPathXmlApplicationContext ac = null; +// public WellSink() { +// LOG.info("wellMysqlSink start..."); +// } +// public void configure(Context context) { +// String s[] = System.getProperty("java.class.path").split(";"); +// for (String string : s) { +// System.out.println("**********************"+string+"************************"); +// } +// ac = new ClassPathXmlApplicationContext( +// new String[]{"classpath:wellSensor/*.xml"}); +// batchSize = context.getInteger("batchSize", 1000); +// } +// +// @Override +// public void start() { +// super.start(); +// LOG.info("--------wellMysqlSink start-------"); +// System.out.println("--------wellMysqlSink start-------"); +// } +// +// @Override +// public void stop() { +// super.stop(); +// LOG.info("--------wellMysqlSink stop-------"); +// } +// +// public Status process() throws EventDeliveryException { +// Status result = Status.READY; +// Channel channel = getChannel(); +// Transaction transaction = channel.getTransaction(); +// Event event; +// String content; +// List actions = Lists.newArrayList(); +// transaction.begin(); +// try { +// for (int i = 0; i < batchSize; i++) { +// event = channel.take(); +// if (event != null) { +// content = new String(event.getBody()); +// actions.add(content); +// } else { +// result = Status.BACKOFF; +// break; +// } +// } +// if (actions.size() > 0) { +// for (String temp : actions) { +// LOG.info("--------wellMysqlSink接收数据：" + temp + "-------"); +// AbstractResponse resp = ResponseResolver.makeResponse(temp); +// if (resp == null) continue; +// resp.setAc(ac); +// resp.process(temp);//对应的消息处理 +// LOG.info("--------wellMysqlSink存库处理完！------"); +// } +// } +// transaction.commit(); +// } catch (Throwable e) { +// try { +//// transaction.rollback(); +// transaction.commit(); +// } catch (Exception e2) { +// LOG.error("Exception in rollback. Rollback might not have been" + +// "successful.", e2); +// } +// LOG.error("Failed to commit transaction." + +// "Transaction rolled back.", e); +// Throwables.propagate(e); +// } finally { +// transaction.close(); +// } +// return result; +// } public static void main(String[] args) { @@ -114,8 +105,8 @@ ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); ac.start(); - String temp = - "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; +// String temp = +// "{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018030001\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\": 90,\"datas\": [{\"uptime\":\"20180911222000\",\"level\":0.55}, {\"uptime\":\"20181111212001\",\"level\": 0.46}],\"logTime\":\"20190315010000\"},\"ts\":\"12345678901\"}"; // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; @@ -137,7 +128,7 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // 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\":\"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}"; diff --git a/src/main/java/org/well/well/core/logback/JulHandler.java b/src/main/java/org/well/well/core/logback/JulHandler.java deleted file mode 100644 index 8dcf385..0000000 --- a/src/main/java/org/well/well/core/logback/JulHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.well.well.core.logback; - -import org.slf4j.bridge.SLF4JBridgeHandler; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - -public class JulHandler implements InitializingBean, DisposableBean { - public void afterPropertiesSet() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - public void destroy() { - SLF4JBridgeHandler.uninstall(); - } -} diff --git a/src/main/java/org/well/well/kafka/KafkaConsumer.java b/src/main/java/org/well/well/kafka/KafkaConsumer.java index 6cc8690..aca94ab 100644 --- a/src/main/java/org/well/well/kafka/KafkaConsumer.java +++ b/src/main/java/org/well/well/kafka/KafkaConsumer.java @@ -24,8 +24,6 @@ ac = cac; } - int i = 0; - @Override public void onMessage(ConsumerRecord record) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 8ad6d7c..9bfb49f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -67,7 +67,7 @@ javax.persistence.sharedCache.d=ALL hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=false hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create @@ -89,7 +89,7 @@ #============================================================================ # log #============================================================================ -log.base=C://logs//sink.log +log.base=..//logs//sink.log log.pattern.default=%d %5p [%t] %c:%L - %m%n log.console.jansi=true log.file.enable=true @@ -172,7 +172,7 @@ bootstrap.servers = 111.198.10.15:12502 kafka.topic = pressure -bootstrap.groupid = 3 +bootstrap.groupid = 6 # ============================================================================ # 告警、工单推送地址 diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index ea3b888..b21f99c 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - false - false + true + true diff --git a/src/main/resources/wellSensor/applicationContext.xml b/src/main/resources/wellSensor/applicationContext.xml index 49a38e3..064966d 100644 --- a/src/main/resources/wellSensor/applicationContext.xml +++ b/src/main/resources/wellSensor/applicationContext.xml @@ -26,7 +26,7 @@ - + diff --git a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar b/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar deleted file mode 100644 index 6592731..0000000 --- a/target/classes/lib/gexin-rp-fastjson-1.0.0.1.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar b/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar deleted file mode 100644 index 6aca531..0000000 --- a/target/classes/lib/gexin-rp-sdk-base-4.0.0.28.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar b/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar deleted file mode 100644 index 0465d6a..0000000 --- a/target/classes/lib/gexin-rp-sdk-http-4.1.0.3.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar b/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar deleted file mode 100644 index 702605d..0000000 --- a/target/classes/lib/gexin-rp-sdk-template-4.0.0.22.jar +++ /dev/null Binary files differ diff --git a/target/classes/lib/protobuf-java-2.5.0.jar b/target/classes/lib/protobuf-java-2.5.0.jar deleted file mode 100644 index 4c4e686..0000000 --- a/target/classes/lib/protobuf-java-2.5.0.jar +++ /dev/null Binary files differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml deleted file mode 100644 index 18b534c..0000000 --- a/target/classes/logback.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - application.local.properties - - - - application.server.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/logback/console.xml b/target/classes/logback/console.xml deleted file mode 100644 index 23655bd..0000000 --- a/target/classes/logback/console.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - ${log.console.jansi} - - - - - %cyan(%date{HH:mm:ss.SSS}) %highlight(%5level) %cyan([%thread] %logger:%line) %white(- %msg%n) - - - ${log.pattern.default} - - - - - - diff --git a/target/classes/logback/file.xml b/target/classes/logback/file.xml deleted file mode 100644 index fa05e46..0000000 --- a/target/classes/logback/file.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - ${log.base} - - ${log.pattern.default} - - - ${log.base}.%d{yyyy-MM-dd} - - - diff --git a/target/classes/logback/inspektr.xml b/target/classes/logback/inspektr.xml deleted file mode 100644 index 77d7af9..0000000 --- a/target/classes/logback/inspektr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ${log.base}.inspektr - - ${log.base}.inspektr.%d{yyyy-MM-dd}.zip - - - %m%n - - - - - - - - diff --git a/target/classes/logback/log4jdbc.xml b/target/classes/logback/log4jdbc.xml deleted file mode 100644 index 6fb6b7a..0000000 --- a/target/classes/logback/log4jdbc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - ${log.base}.jdbc-sqltiming - - %d %m%n%n - - - ${log.base}.jdbc-sqltiming.%d{yyyy-MM-dd}.zip - - - - - - - - - - - - - - diff --git a/target/classes/logback/mail.xml b/target/classes/logback/mail.xml deleted file mode 100644 index 8609c42..0000000 --- a/target/classes/logback/mail.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ERROR - DENY - ACCEPT - - smtp.gmail.com - 465 - true - demo.mossle@gmail.com - demo4mossle - - demo.mossle@gmail.com - - - - - - diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties deleted file mode 100644 index 6acc0e8..0000000 --- a/target/classes/wellSensor/application.properties +++ /dev/null @@ -1,183 +0,0 @@ - - -# ============================================================================ -# application -# ============================================================================ -application.domain.packages=org.well.well -application.i18n.packages=org.springframework.security.messages,\ - com.mossle.core.messages,\ - com.mossle.user.messages,\ - com.mossle.layout.messages -application.scope.type=mock -application.database.type=h2 - - -# ============================================================================ -# dbtest -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -#db.default.username=sensor -#db.default.password=sensor -#db.default.driverClassName=com.mysql.jdbc.Driver -db.default.driverClassName=com.mysql.cj.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false -db.default.username=root -db.default.password=Casic203 -### ============================================================================ -# dbReal -# ============================================================================ -#db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@192.168.10.224:1521:szhtdb3 -#db.default.username=scott -#db.default.password=SZHTDB3 -# ============================================================================ -# sgdb -# ============================================================================ -#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver -#jdbc.url=jdbc:oracle:thin:@192.168.0.102:1521:SZHTDB2 -#jdbc.username=wangpeng -#jdbc.password=wangpeng -#jdbc.url=jdbc:oracle:thin:@10.38.13.159:1521:ORCL2 -#jdbc.username=inlyj -#jdbc.password=inlyj -jdbc.defaultAutoCommit=false -jdbc.initialSize=1 -jdbc.maxActive=60 -jdbc.minIdle=1 -jdbc.maxIdle=20 -jdbc.maxWait=3000 -jdbc.removeAbandoned=true -jdbc.removeAbandonedTimeout=180 -jdbc.wandddd=true -jdbc.testOnBorrow=false -jdbc.testOnReturn=false -jdbc.timeBetweenEvictionRunsMillis=30000 -jdbc.numTestsPerEvictionRun=100 - - -# log4jdbc -# ============================================================================ -log4jdbc.enable=false - - -# ============================================================================ -# hibernate -# ============================================================================ -javax.persistence.sharedCache.d=ALL -hibernate.dialect=org.hibernate.dialect.Oracle10gDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=false -hibernate.format_sql=false -hibernate.generate_statistics=false -#hibernate.hbm2ddl.auto=create - - -# ============================================================================ -# mail -# ============================================================================ -mail.host=smtp.gmail.com -mail.username=demo.mossle@gmail.com -mail.password=demo5mossle -mail.smtp.auth=true -mail.smtp.starttls.enable=true -mail.mode=skip -mail.test.mail=demo.mossle@gmail.com -mail.default.from=demo.mossle@gmail.com - - -#============================================================================ -# log -#============================================================================ -log.base=C://logs//sink.log -log.pattern.default=%d %5p [%t] %c:%L - %m%n -log.console.jansi=true -log.file.enable=true -log.mail.enable=false -log.inspektr.enable=false -log.log4jdbc.enable=false - - -# ============================================================================ -# filter -# ============================================================================ - - - -# ============================================================================ -# servlet -# ============================================================================ - - - -# ============================================================================ -# quartz -# ============================================================================ -quartz.autostartup=false -org.quartz.plugin.historytrigger.class=org.quartz.plugins.history.LoggingTriggerHistoryPlugin - - -# ============================================================================ -# cache -# ============================================================================ -cache.backend=memcached -cache.memcached.client.enable=true -cache.memcached.client.url=localhost:11211 -cache.memcached.server.enable=true -cache.memcached.server.url=localhost:11211 - -# ============================================================================ -# store -# ============================================================================ -store.baseDir=casic.store - -# ============================================================================ -# lampSink -# ============================================================================ -lampSink.enable=false - - -# ============================================================================ -# schedular -# ========================================================= =================== -scheduler.enabled=true -scheduler.com.casic.baseService.scheduler.DeviceCheckingJob.execute=true -deviceChecking.enabled=true -#cron.time=0 37 15 * * ? - -# ============================================================================ -# ���ͼ�� -# ============================================================================ -SEND.INTERVAL = 10000 -# ============================================================================ -# 个推配置信息 -# ============================================================================ -gt.appId = qQqFtTBrUa7SGLjntUlpT4 -gt.appKey = GNjHLiqJkD6OoeZbtbdfi5 -gt.masterSecret = TZRYQknkxLAJ58uH56PeS6 - -# ============================================================================ -# ACTIVEMQ配置 -# ============================================================================ -activemq_url = tcp://192.168.0.203:61616 -activemq_username = -activemq_password = - - - -# ============================================================================ -# kafka配置 -# ============================================================================ -#bootstrap.servers = localhost:9092 -bootstrap.servers = 111.198.10.15:12502 - -kafka.topic = pressure -bootstrap.groupid = 0 - -# ============================================================================ -# 告警、工单推送地址 -# ============================================================================ -#sendURL= http://111.198.10.15:11307/job/updateSinkJob -sendURL =http://localhost:11304/job/updateSinkJob - - diff --git a/target/classes/wellSensor/applicationContex-quartz.xml b/target/classes/wellSensor/applicationContex-quartz.xml deleted file mode 100644 index 55bbc86..0000000 --- a/target/classes/wellSensor/applicationContex-quartz.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-cache.xml b/target/classes/wellSensor/applicationContext-cache.xml deleted file mode 100644 index a6a3bd1..0000000 --- a/target/classes/wellSensor/applicationContext-cache.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/target/classes/wellSensor/applicationContext-hibernate.xml b/target/classes/wellSensor/applicationContext-hibernate.xml deleted file mode 100644 index ea3b888..0000000 --- a/target/classes/wellSensor/applicationContext-hibernate.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.hibernate.dialect.MySQL5Dialect - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/wellSensor/applicationContext-jdbc.xml b/target/classes/wellSensor/applicationContext-jdbc.xml deleted file mode 100644 index 6cdcc6f..0000000 --- a/target/classes/wellSensor/applicationContext-jdbc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/target/classes/wellSensor/applicationContext-springmvc.xml b/target/classes/wellSensor/applicationContext-springmvc.xml deleted file mode 100644 index 390b13f..0000000 --- a/target/classes/wellSensor/applicationContext-springmvc.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/classes/wellSensor/applicationContext.xml b/target/classes/wellSensor/applicationContext.xml deleted file mode 100644 index 49a38e3..0000000 --- a/target/classes/wellSensor/applicationContext.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -