diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 57fc816..83ba01f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -143,4 +143,11 @@
}
}
}
+
+ public List getInstallHeightDevices(){
+ Map paramMap = new HashMap();
+ String sql="SELECT devcode, install_height FROM bus_device WHERE install_height IS NOT NULL";
+ List list = getSession().createSQLQuery(sql).setProperties(paramMap).list();
+ return list;
+ }
}
\ No newline at end of file
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 57fc816..83ba01f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -143,4 +143,11 @@
}
}
}
+
+ public List getInstallHeightDevices(){
+ Map paramMap = new HashMap();
+ String sql="SELECT devcode, install_height FROM bus_device WHERE install_height IS NOT NULL";
+ List list = getSession().createSQLQuery(sql).setProperties(paramMap).list();
+ return list;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java
index d00907f..61aea14 100644
--- a/src/main/java/org/well/well/manager/LGGasManager.java
+++ b/src/main/java/org/well/well/manager/LGGasManager.java
@@ -70,7 +70,6 @@
}
String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
-// if(isExist(devCode,upTime)) continue;//去重
gas = String.format("%.2f", Double.valueOf(gas));
//1.存数据
@@ -79,23 +78,22 @@
if (i < jsonArray.size() - 1) {
continue;
}
- //3.清离线
- deviceManager.clearOffline(devCode);
+
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
- List ruleRankList = alarmRuleManager.getRuleRank(devCode);
- float rankThresh =0;
- String isAlarm="1";
+ List ruleRankList = alarmRuleManager.getRuleRank(devCode);
+ float rankThresh = 0;
+ String isAlarm = "1";
if (ruleRankList.size() > 0) {
Object rankValue = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[2];
- rankThresh = rankValue!=null?Float.valueOf(rankValue.toString()):0;
+ rankThresh = rankValue != null ? Float.valueOf(rankValue.toString()) : 0;
isAlarm = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[4].toString();
}
- if (rankThresh>0&&"1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
+ if (rankThresh > 0 && "1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
+// AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
//获取报警等级
String alarmContent = GasLiquidAlarmEnum.GAS_OVER_THRESH.getName();
Integer alarmLevel = 0;
@@ -109,30 +107,21 @@
}
}
- //已存在报警
- if (null != alarmRecord) {
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", alarmLevel, alarmContent,
- gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //1.写入新的告警
- alarmRecordManager.saveData(null, "1", alarmLevel,
- alarmContent, gas, device,
- devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
- //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
- } else {//未超限
- //1.清除之前的报警
- alarmRecordManager.clearAlarmByNormalData(devCode, "1");
+
+ //1.写入新的告警
+ alarmRecordManager.saveData(null, "1", alarmLevel,
+ alarmContent, gas, device,
+ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
+ //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
}
+ //3.清离线
+ deviceManager.clearOffline(devCode);
} catch (IOException e) {
e.printStackTrace();
logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -140,7 +129,6 @@
}
}
-
public void processAlarmData(JSONObject jsonObject, String devCode) {
JSONArray jsonArray = (JSONArray) jsonObject.get("eventType");
String logTime = (jsonObject.get("logTime")).toString();
@@ -172,16 +160,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGGas.class);
- criteria.add(Restrictions.eq("devCode", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime()))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 57fc816..83ba01f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -143,4 +143,11 @@
}
}
}
+
+ public List getInstallHeightDevices(){
+ Map paramMap = new HashMap();
+ String sql="SELECT devcode, install_height FROM bus_device WHERE install_height IS NOT NULL";
+ List list = getSession().createSQLQuery(sql).setProperties(paramMap).list();
+ return list;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java
index d00907f..61aea14 100644
--- a/src/main/java/org/well/well/manager/LGGasManager.java
+++ b/src/main/java/org/well/well/manager/LGGasManager.java
@@ -70,7 +70,6 @@
}
String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
-// if(isExist(devCode,upTime)) continue;//去重
gas = String.format("%.2f", Double.valueOf(gas));
//1.存数据
@@ -79,23 +78,22 @@
if (i < jsonArray.size() - 1) {
continue;
}
- //3.清离线
- deviceManager.clearOffline(devCode);
+
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
- List ruleRankList = alarmRuleManager.getRuleRank(devCode);
- float rankThresh =0;
- String isAlarm="1";
+ List ruleRankList = alarmRuleManager.getRuleRank(devCode);
+ float rankThresh = 0;
+ String isAlarm = "1";
if (ruleRankList.size() > 0) {
Object rankValue = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[2];
- rankThresh = rankValue!=null?Float.valueOf(rankValue.toString()):0;
+ rankThresh = rankValue != null ? Float.valueOf(rankValue.toString()) : 0;
isAlarm = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[4].toString();
}
- if (rankThresh>0&&"1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
+ if (rankThresh > 0 && "1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
+// AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
//获取报警等级
String alarmContent = GasLiquidAlarmEnum.GAS_OVER_THRESH.getName();
Integer alarmLevel = 0;
@@ -109,30 +107,21 @@
}
}
- //已存在报警
- if (null != alarmRecord) {
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", alarmLevel, alarmContent,
- gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //1.写入新的告警
- alarmRecordManager.saveData(null, "1", alarmLevel,
- alarmContent, gas, device,
- devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
- //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
- } else {//未超限
- //1.清除之前的报警
- alarmRecordManager.clearAlarmByNormalData(devCode, "1");
+
+ //1.写入新的告警
+ alarmRecordManager.saveData(null, "1", alarmLevel,
+ alarmContent, gas, device,
+ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
+ //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
}
+ //3.清离线
+ deviceManager.clearOffline(devCode);
} catch (IOException e) {
e.printStackTrace();
logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -140,7 +129,6 @@
}
}
-
public void processAlarmData(JSONObject jsonObject, String devCode) {
JSONArray jsonArray = (JSONArray) jsonObject.get("eventType");
String logTime = (jsonObject.get("logTime")).toString();
@@ -172,16 +160,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGGas.class);
- criteria.add(Restrictions.eq("devCode", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime()))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java
index 412e519..740045b 100644
--- a/src/main/java/org/well/well/manager/LGLiquidManager.java
+++ b/src/main/java/org/well/well/manager/LGLiquidManager.java
@@ -44,11 +44,14 @@
private DeviceManager deviceManager;
@Resource
private BusWellManager busWellManager;
- @Resource
- private AlarmJobManager alarmJobManager;
+
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+ private final String devcodePrex = "3220";//需要对此类设备监测值加安装高度
+
+ private List installHeighsList;
+
public Map saveData(LiquidDTO liquidDTO) throws IOException {
Map resultMap = new HashMap();
@@ -82,8 +85,21 @@
String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
if (StringUtils.isBlank(level)) continue;
- //todo:需要加安装高度
+
Float levelFloat = new BigDecimal(level).floatValue() / 100;
+ //3220开头的设备需要加安装高度
+ if (devCode.indexOf(devcodePrex) == 0 && levelFloat != 0) {
+ if (null == installHeighsList) {
+ installHeighsList = deviceManager.getInstallHeightDevices();
+ }
+ for(Object[] objects: installHeighsList){
+ if(objects[0]!=null&&devCode.equals(objects[0].toString())){
+ levelFloat+= Float.valueOf(objects[1].toString());
+ break;
+ }
+ }
+ level=levelFloat+"";
+ }
//1.存数据
LiquidDTO liquidDTO = new LiquidDTO(String.format("%.2f", Double.valueOf(levelFloat)), cell,
upTime, devCode, busWell == null ? "" : busWell.getWellCode());
@@ -96,37 +112,28 @@
//3.清离线
deviceManager.clearOffline(devCode);
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());
-
//超限
if (levelFloat >= Float.valueOf(thresh)) {
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
- //获取报警等级
+ //获取报警内容
String alarmContent = GasLiquidAlarmEnum.LIQUID_OVER_THRESH.getName();
- if (null != alarmRecord) {//已存在报警
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", null, alarmContent,
- level, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //2.写入新的告警
- alarmRecordManager.saveData(null, "1", null,
- alarmContent, level, device,
- devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
-// //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
+
+ //2.写入新的告警
+ alarmRecordManager.saveData(null, "1", null,
+ alarmContent, level, device,
+ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
+// //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
} else {//未超限
//1.清除之前的报警
alarmRecordManager.clearAlarmByNormalData(devCode, "1");
@@ -138,16 +145,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGLiquid.class);
- criteria.add(Restrictions.eq("devId", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 57fc816..83ba01f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -143,4 +143,11 @@
}
}
}
+
+ public List getInstallHeightDevices(){
+ Map paramMap = new HashMap();
+ String sql="SELECT devcode, install_height FROM bus_device WHERE install_height IS NOT NULL";
+ List list = getSession().createSQLQuery(sql).setProperties(paramMap).list();
+ return list;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java
index d00907f..61aea14 100644
--- a/src/main/java/org/well/well/manager/LGGasManager.java
+++ b/src/main/java/org/well/well/manager/LGGasManager.java
@@ -70,7 +70,6 @@
}
String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
-// if(isExist(devCode,upTime)) continue;//去重
gas = String.format("%.2f", Double.valueOf(gas));
//1.存数据
@@ -79,23 +78,22 @@
if (i < jsonArray.size() - 1) {
continue;
}
- //3.清离线
- deviceManager.clearOffline(devCode);
+
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
- List ruleRankList = alarmRuleManager.getRuleRank(devCode);
- float rankThresh =0;
- String isAlarm="1";
+ List ruleRankList = alarmRuleManager.getRuleRank(devCode);
+ float rankThresh = 0;
+ String isAlarm = "1";
if (ruleRankList.size() > 0) {
Object rankValue = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[2];
- rankThresh = rankValue!=null?Float.valueOf(rankValue.toString()):0;
+ rankThresh = rankValue != null ? Float.valueOf(rankValue.toString()) : 0;
isAlarm = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[4].toString();
}
- if (rankThresh>0&&"1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
+ if (rankThresh > 0 && "1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
+// AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
//获取报警等级
String alarmContent = GasLiquidAlarmEnum.GAS_OVER_THRESH.getName();
Integer alarmLevel = 0;
@@ -109,30 +107,21 @@
}
}
- //已存在报警
- if (null != alarmRecord) {
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", alarmLevel, alarmContent,
- gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //1.写入新的告警
- alarmRecordManager.saveData(null, "1", alarmLevel,
- alarmContent, gas, device,
- devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
- //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
- } else {//未超限
- //1.清除之前的报警
- alarmRecordManager.clearAlarmByNormalData(devCode, "1");
+
+ //1.写入新的告警
+ alarmRecordManager.saveData(null, "1", alarmLevel,
+ alarmContent, gas, device,
+ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
+ //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
}
+ //3.清离线
+ deviceManager.clearOffline(devCode);
} catch (IOException e) {
e.printStackTrace();
logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -140,7 +129,6 @@
}
}
-
public void processAlarmData(JSONObject jsonObject, String devCode) {
JSONArray jsonArray = (JSONArray) jsonObject.get("eventType");
String logTime = (jsonObject.get("logTime")).toString();
@@ -172,16 +160,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGGas.class);
- criteria.add(Restrictions.eq("devCode", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime()))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java
index 412e519..740045b 100644
--- a/src/main/java/org/well/well/manager/LGLiquidManager.java
+++ b/src/main/java/org/well/well/manager/LGLiquidManager.java
@@ -44,11 +44,14 @@
private DeviceManager deviceManager;
@Resource
private BusWellManager busWellManager;
- @Resource
- private AlarmJobManager alarmJobManager;
+
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+ private final String devcodePrex = "3220";//需要对此类设备监测值加安装高度
+
+ private List installHeighsList;
+
public Map saveData(LiquidDTO liquidDTO) throws IOException {
Map resultMap = new HashMap();
@@ -82,8 +85,21 @@
String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
if (StringUtils.isBlank(level)) continue;
- //todo:需要加安装高度
+
Float levelFloat = new BigDecimal(level).floatValue() / 100;
+ //3220开头的设备需要加安装高度
+ if (devCode.indexOf(devcodePrex) == 0 && levelFloat != 0) {
+ if (null == installHeighsList) {
+ installHeighsList = deviceManager.getInstallHeightDevices();
+ }
+ for(Object[] objects: installHeighsList){
+ if(objects[0]!=null&&devCode.equals(objects[0].toString())){
+ levelFloat+= Float.valueOf(objects[1].toString());
+ break;
+ }
+ }
+ level=levelFloat+"";
+ }
//1.存数据
LiquidDTO liquidDTO = new LiquidDTO(String.format("%.2f", Double.valueOf(levelFloat)), cell,
upTime, devCode, busWell == null ? "" : busWell.getWellCode());
@@ -96,37 +112,28 @@
//3.清离线
deviceManager.clearOffline(devCode);
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());
-
//超限
if (levelFloat >= Float.valueOf(thresh)) {
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
- //获取报警等级
+ //获取报警内容
String alarmContent = GasLiquidAlarmEnum.LIQUID_OVER_THRESH.getName();
- if (null != alarmRecord) {//已存在报警
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", null, alarmContent,
- level, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //2.写入新的告警
- alarmRecordManager.saveData(null, "1", null,
- alarmContent, level, device,
- devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
-// //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
+
+ //2.写入新的告警
+ alarmRecordManager.saveData(null, "1", null,
+ alarmContent, level, device,
+ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
+// //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
} else {//未超限
//1.清除之前的报警
alarmRecordManager.clearAlarmByNormalData(devCode, "1");
@@ -138,16 +145,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGLiquid.class);
- criteria.add(Restrictions.eq("devId", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties
index da67111..b441c56 100644
--- a/src/main/resources/wellSensor/application.properties
+++ b/src/main/resources/wellSensor/application.properties
@@ -167,8 +167,10 @@
# ============================================================================
# kafka配置
# ============================================================================
-bootstrap.servers = localhost:9092
-kafka.topic = sensor2
+#bootstrap.servers = localhost:9092
+bootstrap.servers = 111.198.10.15:12502
+
+kafka.topic = gas
bootstrap.groupid = 0
# ============================================================================
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 57fc816..83ba01f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -143,4 +143,11 @@
}
}
}
+
+ public List getInstallHeightDevices(){
+ Map paramMap = new HashMap();
+ String sql="SELECT devcode, install_height FROM bus_device WHERE install_height IS NOT NULL";
+ List list = getSession().createSQLQuery(sql).setProperties(paramMap).list();
+ return list;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java
index d00907f..61aea14 100644
--- a/src/main/java/org/well/well/manager/LGGasManager.java
+++ b/src/main/java/org/well/well/manager/LGGasManager.java
@@ -70,7 +70,6 @@
}
String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
-// if(isExist(devCode,upTime)) continue;//去重
gas = String.format("%.2f", Double.valueOf(gas));
//1.存数据
@@ -79,23 +78,22 @@
if (i < jsonArray.size() - 1) {
continue;
}
- //3.清离线
- deviceManager.clearOffline(devCode);
+
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
- List ruleRankList = alarmRuleManager.getRuleRank(devCode);
- float rankThresh =0;
- String isAlarm="1";
+ List ruleRankList = alarmRuleManager.getRuleRank(devCode);
+ float rankThresh = 0;
+ String isAlarm = "1";
if (ruleRankList.size() > 0) {
Object rankValue = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[2];
- rankThresh = rankValue!=null?Float.valueOf(rankValue.toString()):0;
+ rankThresh = rankValue != null ? Float.valueOf(rankValue.toString()) : 0;
isAlarm = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[4].toString();
}
- if (rankThresh>0&&"1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
+ if (rankThresh > 0 && "1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
+// AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
//获取报警等级
String alarmContent = GasLiquidAlarmEnum.GAS_OVER_THRESH.getName();
Integer alarmLevel = 0;
@@ -109,30 +107,21 @@
}
}
- //已存在报警
- if (null != alarmRecord) {
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", alarmLevel, alarmContent,
- gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //1.写入新的告警
- alarmRecordManager.saveData(null, "1", alarmLevel,
- alarmContent, gas, device,
- devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
- //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
- } else {//未超限
- //1.清除之前的报警
- alarmRecordManager.clearAlarmByNormalData(devCode, "1");
+
+ //1.写入新的告警
+ alarmRecordManager.saveData(null, "1", alarmLevel,
+ alarmContent, gas, device,
+ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
+ //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
}
+ //3.清离线
+ deviceManager.clearOffline(devCode);
} catch (IOException e) {
e.printStackTrace();
logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -140,7 +129,6 @@
}
}
-
public void processAlarmData(JSONObject jsonObject, String devCode) {
JSONArray jsonArray = (JSONArray) jsonObject.get("eventType");
String logTime = (jsonObject.get("logTime")).toString();
@@ -172,16 +160,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGGas.class);
- criteria.add(Restrictions.eq("devCode", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime()))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java
index 412e519..740045b 100644
--- a/src/main/java/org/well/well/manager/LGLiquidManager.java
+++ b/src/main/java/org/well/well/manager/LGLiquidManager.java
@@ -44,11 +44,14 @@
private DeviceManager deviceManager;
@Resource
private BusWellManager busWellManager;
- @Resource
- private AlarmJobManager alarmJobManager;
+
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+ private final String devcodePrex = "3220";//需要对此类设备监测值加安装高度
+
+ private List installHeighsList;
+
public Map saveData(LiquidDTO liquidDTO) throws IOException {
Map resultMap = new HashMap();
@@ -82,8 +85,21 @@
String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
if (StringUtils.isBlank(level)) continue;
- //todo:需要加安装高度
+
Float levelFloat = new BigDecimal(level).floatValue() / 100;
+ //3220开头的设备需要加安装高度
+ if (devCode.indexOf(devcodePrex) == 0 && levelFloat != 0) {
+ if (null == installHeighsList) {
+ installHeighsList = deviceManager.getInstallHeightDevices();
+ }
+ for(Object[] objects: installHeighsList){
+ if(objects[0]!=null&&devCode.equals(objects[0].toString())){
+ levelFloat+= Float.valueOf(objects[1].toString());
+ break;
+ }
+ }
+ level=levelFloat+"";
+ }
//1.存数据
LiquidDTO liquidDTO = new LiquidDTO(String.format("%.2f", Double.valueOf(levelFloat)), cell,
upTime, devCode, busWell == null ? "" : busWell.getWellCode());
@@ -96,37 +112,28 @@
//3.清离线
deviceManager.clearOffline(devCode);
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());
-
//超限
if (levelFloat >= Float.valueOf(thresh)) {
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
- //获取报警等级
+ //获取报警内容
String alarmContent = GasLiquidAlarmEnum.LIQUID_OVER_THRESH.getName();
- if (null != alarmRecord) {//已存在报警
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", null, alarmContent,
- level, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //2.写入新的告警
- alarmRecordManager.saveData(null, "1", null,
- alarmContent, level, device,
- devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
-// //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
+
+ //2.写入新的告警
+ alarmRecordManager.saveData(null, "1", null,
+ alarmContent, level, device,
+ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
+// //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
} else {//未超限
//1.清除之前的报警
alarmRecordManager.clearAlarmByNormalData(devCode, "1");
@@ -138,16 +145,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGLiquid.class);
- criteria.add(Restrictions.eq("devId", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties
index da67111..b441c56 100644
--- a/src/main/resources/wellSensor/application.properties
+++ b/src/main/resources/wellSensor/application.properties
@@ -167,8 +167,10 @@
# ============================================================================
# kafka配置
# ============================================================================
-bootstrap.servers = localhost:9092
-kafka.topic = sensor2
+#bootstrap.servers = localhost:9092
+bootstrap.servers = 111.198.10.15:12502
+
+kafka.topic = gas
bootstrap.groupid = 0
# ============================================================================
diff --git a/src/main/resources/wellSensor/applicationContex-ActiveMQ.xml b/src/main/resources/wellSensor/applicationContex-ActiveMQ.xml
deleted file mode 100644
index a11375d..0000000
--- a/src/main/resources/wellSensor/applicationContex-ActiveMQ.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hjt.msg.queue
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 172042e..13bc77c 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,46 @@
Manifest-Version: 1.0
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar ao
+ palliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-
+ 4.0.6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jm
+ s-3.2.8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz
+ 4-1.3.0.jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.
+ jar geronimo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar j
+ boss-logging-3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-
+ lib-2.4-jdk15.jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-
+ 1.4.jar commons-httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.
+ 6.RELEASE.jar commons-io-2.4.jar hutool-captcha-4.6.0.jar commons-poo
+ l-1.5.4.jar spring-aop-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.
+ 11.jar joda-time-2.1.jar spring-retry-1.1.3.RELEASE.jar spring-web-4.
+ 0.6.RELEASE.jar spring-jdbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibern
+ ate-core-4.3.6.Final.jar ojdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jst
+ l-1.2.jar jackson-annotations-2.4.0.jar xbean-spring-4.2.jar spring-c
+ ore-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar log
+ 4j-1.2.16.jar spring-expression-4.0.6.RELEASE.jar slf4j-log4j12-1.6.1
+ .jar flume-ng-core-1.4.0.jar java-sizeof-0.0.4.jar spring-tx-4.0.6.RE
+ LEASE.jar logback-classic-1.1.2.jar gexin-rp-fastjson-1.0.0.1.jar gex
+ in-rp-sdk-base-4.0.0.28.jar gexin-rp-sdk-http-4.1.0.3.jar gexin-rp-sd
+ k-template-4.0.0.22.jar protobuf-java-2.5.0.jar commons-collections-3
+ .2.1.jar activemq-client-5.14.5.jar spring-messaging-4.3.3.RELEASE.ja
+ r commons-beanutils-1.9.2.jar httpclient-4.2.1.jar netty-3.4.0.Final.
+ jar classmate-1.0.0.jar activemq-openwire-legacy-5.14.5.jar jboss-log
+ ging-annotations-1.2.0.Beta1.jar geronimo-jta_1.0.1B_spec-1.0.1.jar c
+ ommons-lang-2.5.jar commons-cli-1.2.jar commons-logging-1.1.1.jar com
+ mons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-spring-5.14.5.jar f
+ astjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-annotations-4.0.
+ 5.Final.jar mysql-connector-java-5.1.25.jar spring-kafka-1.1.1.RELEAS
+ E.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-6.1.26.jar
+ orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.6.0.jar c
+ oncurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.Final.ja
+ r spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.jar ez
+ morph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_spec
+ -1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-jav
+ a-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jacks
+ on-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf
+ 4j-1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2
+ .4.2.jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-
+ lang3-3.3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar
+ jandex-1.1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.ja
+ r paranamer-2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5
+ .jar
Main-Class: org.well.mysql.sink.WellSink
diff --git a/META-INF/application.xml b/META-INF/application.xml
deleted file mode 100644
index 8533088..0000000
--- a/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index fa57954..8913eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,4 +283,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF b/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
deleted file mode 100644
index b4a7450..0000000
--- a/src/main/java/org/well/mysql/sink/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: commons-beanutils-1.9.2.jar httpcore-4.2.1.jar javassist-3
- .18.1-GA.jar velocity-1.7.jar concurrentlinkedhashmap-lru-1.2_jdk5.ja
- r commons-compiler-2.7.6.jar jackson-jaxrs-json-provider-2.4.2.jar sp
- ring-retry-1.1.3.RELEASE.jar json-lib-2.4-jdk15.jar commons-pool2-2.4
- .2.jar activemq-jms-pool-5.14.5.jar java-sizeof-0.0.4.jar fastjson-1.
- 1.15.jar spring-beans-4.0.6.RELEASE.jar jul-to-slf4j-1.7.7.jar flume-
- ng-sdk-1.4.0.jar xbean-spring-4.2.jar hibernate-core-4.3.6.Final.jar
- kafka-clients-0.11.0.1.jar jsr305-1.3.9.jar gson-2.2.2.jar activemq-p
- ool-5.14.5.jar hibernate-jpa-2.1-api-1.0.0.Final.jar commons-logging-
- 1.1.1.jar xml-apis-1.0.b2.jar log4j-1.2.16.jar classmate-1.0.0.jar lo
- gback-classic-1.1.2.jar jackson-databind-2.4.2.jar avro-1.7.3.jar com
- mons-io-2.4.jar flume-ng-core-1.4.0.jar commons-fileupload-1.3.1.jar
- logback-core-1.1.2.jar joda-time-2.1.jar activemq-client-5.14.5.jar o
- rika-core-1.4.5.jar jackson-jaxrs-base-2.4.2.jar ezmorph-1.0.6.jar sp
- ring-kafka-1.1.1.RELEASE.jar mina-core-2.0.4.jar spring-context-suppo
- rt-4.0.6.RELEASE.jar geronimo-j2ee-management_1.1_spec-1.0.1.jar comm
- ons-httpclient-3.1.jar jackson-module-jaxb-annotations-2.4.2.jar libt
- hrift-0.7.0.jar spring-tx-4.0.6.RELEASE.jar aopalliance-1.0.jar jboss
- -transaction-api_1.2_spec-1.0.0.Final.jar jandex-1.1.0.Final.jar hawt
- buf-1.11.jar guava-10.0.1.jar servlet-api-2.5-20110124.jar validation
- -api-1.1.0.Final.jar netty-3.4.0.Final.jar commons-dbcp-1.4.jar sprin
- g-jdbc-4.0.6.RELEASE.jar spring-aop-4.0.6.RELEASE.jar activemq-broker
- -5.14.5.jar geronimo-jms_1.1_spec-1.1.1.jar mysql-connector-java-5.1.
- 25.jar jcl-over-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar flume-ng
- -configuration-1.4.0.jar jansi-1.11.jar commons-lang3-3.3.2.jar dom4j
- -1.6.1.jar spring-expression-4.0.6.RELEASE.jar spring-webmvc-4.0.6.RE
- LEASE.jar lz4-1.3.0.jar spring-jms-3.2.8.RELEASE.jar commons-pool-1.5
- .4.jar jetty-6.1.26.jar jackson-core-asl-1.9.3.jar hibernate-commons-
- annotations-4.0.5.Final.jar slf4j-log4j12-1.6.1.jar jackson-mapper-as
- l-1.9.3.jar jboss-logging-annotations-1.2.0.Beta1.jar commons-codec-1
- .9.jar jackson-annotations-2.4.0.jar commons-cli-1.2.jar paranamer-2.
- 3.jar avro-ipc-1.7.3.jar log4jdbc-remix-0.2.7.jar hibernate-validator
- -5.1.2.Final.jar jetty-util-6.1.26.jar snappy-java-1.1.2.6.jar common
- s-lang-2.5.jar spring-messaging-4.3.3.RELEASE.jar antlr-2.7.7.jar gex
- in-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-sd
- k-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2
- .5.0.jar slf4j-api-1.7.7.jar httpclient-4.2.1.jar activemq-spring-5.1
- 4.5.jar spring-web-4.0.6.RELEASE.jar jackson-core-2.4.2.jar activemq-
- openwire-legacy-5.14.5.jar spring-context-4.0.6.RELEASE.jar ojdbc6-11
- .1.0.7.0.jar spring-core-4.0.6.RELEASE.jar jstl-1.2.jar jboss-logging
- -3.1.3.GA.jar geronimo-jta_1.0.1B_spec-1.0.1.jar janino-2.7.6.jar com
- mons-collections-3.2.1.jar
-Main-Class: org.well.mysql.sink.WellSink
-
diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java
index 57fc816..83ba01f 100644
--- a/src/main/java/org/well/well/manager/DeviceManager.java
+++ b/src/main/java/org/well/well/manager/DeviceManager.java
@@ -143,4 +143,11 @@
}
}
}
+
+ public List getInstallHeightDevices(){
+ Map paramMap = new HashMap();
+ String sql="SELECT devcode, install_height FROM bus_device WHERE install_height IS NOT NULL";
+ List list = getSession().createSQLQuery(sql).setProperties(paramMap).list();
+ return list;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java
index d00907f..61aea14 100644
--- a/src/main/java/org/well/well/manager/LGGasManager.java
+++ b/src/main/java/org/well/well/manager/LGGasManager.java
@@ -70,7 +70,6 @@
}
String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
-// if(isExist(devCode,upTime)) continue;//去重
gas = String.format("%.2f", Double.valueOf(gas));
//1.存数据
@@ -79,23 +78,22 @@
if (i < jsonArray.size() - 1) {
continue;
}
- //3.清离线
- deviceManager.clearOffline(devCode);
+
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
- List ruleRankList = alarmRuleManager.getRuleRank(devCode);
- float rankThresh =0;
- String isAlarm="1";
+ List ruleRankList = alarmRuleManager.getRuleRank(devCode);
+ float rankThresh = 0;
+ String isAlarm = "1";
if (ruleRankList.size() > 0) {
Object rankValue = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[2];
- rankThresh = rankValue!=null?Float.valueOf(rankValue.toString()):0;
+ rankThresh = rankValue != null ? Float.valueOf(rankValue.toString()) : 0;
isAlarm = ((Object[]) ruleRankList.get(ruleRankList.size() - 1))[4].toString();
}
- if (rankThresh>0&&"1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
+ if (rankThresh > 0 && "1".equals(isAlarm) && Float.valueOf(gas) >= rankThresh) {//浓度超限
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
+// AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
//获取报警等级
String alarmContent = GasLiquidAlarmEnum.GAS_OVER_THRESH.getName();
Integer alarmLevel = 0;
@@ -109,30 +107,21 @@
}
}
- //已存在报警
- if (null != alarmRecord) {
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", alarmLevel, alarmContent,
- gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //1.写入新的告警
- alarmRecordManager.saveData(null, "1", alarmLevel,
- alarmContent, gas, device,
- devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
- //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
- } else {//未超限
- //1.清除之前的报警
- alarmRecordManager.clearAlarmByNormalData(devCode, "1");
+
+ //1.写入新的告警
+ alarmRecordManager.saveData(null, "1", alarmLevel,
+ alarmContent, gas, device,
+ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent);
+ //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
}
+ //3.清离线
+ deviceManager.clearOffline(devCode);
} catch (IOException e) {
e.printStackTrace();
logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -140,7 +129,6 @@
}
}
-
public void processAlarmData(JSONObject jsonObject, String devCode) {
JSONArray jsonArray = (JSONArray) jsonObject.get("eventType");
String logTime = (jsonObject.get("logTime")).toString();
@@ -172,16 +160,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGGas.class);
- criteria.add(Restrictions.eq("devCode", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime()))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java
index 412e519..740045b 100644
--- a/src/main/java/org/well/well/manager/LGLiquidManager.java
+++ b/src/main/java/org/well/well/manager/LGLiquidManager.java
@@ -44,11 +44,14 @@
private DeviceManager deviceManager;
@Resource
private BusWellManager busWellManager;
- @Resource
- private AlarmJobManager alarmJobManager;
+
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+ private final String devcodePrex = "3220";//需要对此类设备监测值加安装高度
+
+ private List installHeighsList;
+
public Map saveData(LiquidDTO liquidDTO) throws IOException {
Map resultMap = new HashMap();
@@ -82,8 +85,21 @@
String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString();
String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString();
if (StringUtils.isBlank(level)) continue;
- //todo:需要加安装高度
+
Float levelFloat = new BigDecimal(level).floatValue() / 100;
+ //3220开头的设备需要加安装高度
+ if (devCode.indexOf(devcodePrex) == 0 && levelFloat != 0) {
+ if (null == installHeighsList) {
+ installHeighsList = deviceManager.getInstallHeightDevices();
+ }
+ for(Object[] objects: installHeighsList){
+ if(objects[0]!=null&&devCode.equals(objects[0].toString())){
+ levelFloat+= Float.valueOf(objects[1].toString());
+ break;
+ }
+ }
+ level=levelFloat+"";
+ }
//1.存数据
LiquidDTO liquidDTO = new LiquidDTO(String.format("%.2f", Double.valueOf(levelFloat)), cell,
upTime, devCode, busWell == null ? "" : busWell.getWellCode());
@@ -96,37 +112,28 @@
//3.清离线
deviceManager.clearOffline(devCode);
//4.清除设备告警
- alarmRecordManager.clearAlarmByNormalData(devCode, "2");
+ alarmRecordManager.clearAlarmByNormalData(devCode, "");
//获取报警阈值
String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());
-
//超限
if (levelFloat >= Float.valueOf(thresh)) {
Device device = deviceManager.getDeviceByDevCode(devCode);
- AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode);
- //获取报警等级
+ //获取报警内容
String alarmContent = GasLiquidAlarmEnum.LIQUID_OVER_THRESH.getName();
- if (null != alarmRecord) {//已存在报警
- //1.清除上一条告警记录
- alarmRecordManager.clearAlarm(devCode, "1", "");
- //2.写入新的告警记录
- alarmRecordManager.saveData(null, "1", null, alarmContent,
- level, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent);
- } else {//不存在上一条报警时
- //未注册设备舍弃
- if (device == null) {
- return;
- }
-
- //2.写入新的告警
- alarmRecordManager.saveData(null, "1", null,
- alarmContent, level, device,
- devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
-// //3.toDo:向app推送报警消息
- ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+ //未注册设备舍弃
+ if (device == null) {
+ return;
}
+
+ //2.写入新的告警
+ alarmRecordManager.saveData(null, "1", null,
+ alarmContent, level, device,
+ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent);
+// //3.toDo:向app推送报警消息
+ ThreadUtil.excuteMsg(null, alarmContent, busWell == null ? "" : busWell.getWellCode());
+
} else {//未超限
//1.清除之前的报警
alarmRecordManager.clearAlarmByNormalData(devCode, "1");
@@ -138,16 +145,4 @@
}
}
- public boolean isExist(String devcode, String upTime) {
-
- Criteria criteria = getSession().createCriteria(LGLiquid.class);
- criteria.add(Restrictions.eq("devId", devcode));
- try {
- criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime))));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- List methaneList = criteria.list();
- return methaneList.size() > 0 ? true : false;
- }
}
diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties
index da67111..b441c56 100644
--- a/src/main/resources/wellSensor/application.properties
+++ b/src/main/resources/wellSensor/application.properties
@@ -167,8 +167,10 @@
# ============================================================================
# kafka配置
# ============================================================================
-bootstrap.servers = localhost:9092
-kafka.topic = sensor2
+#bootstrap.servers = localhost:9092
+bootstrap.servers = 111.198.10.15:12502
+
+kafka.topic = gas
bootstrap.groupid = 0
# ============================================================================
diff --git a/src/main/resources/wellSensor/applicationContex-ActiveMQ.xml b/src/main/resources/wellSensor/applicationContex-ActiveMQ.xml
deleted file mode 100644
index a11375d..0000000
--- a/src/main/resources/wellSensor/applicationContex-ActiveMQ.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hjt.msg.queue
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties
index da67111..b441c56 100644
--- a/target/classes/wellSensor/application.properties
+++ b/target/classes/wellSensor/application.properties
@@ -167,8 +167,10 @@
# ============================================================================
# kafka配置
# ============================================================================
-bootstrap.servers = localhost:9092
-kafka.topic = sensor2
+#bootstrap.servers = localhost:9092
+bootstrap.servers = 111.198.10.15:12502
+
+kafka.topic = gas
bootstrap.groupid = 0
# ============================================================================