diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 13bc77c..5ec5295 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,46 +1,44 @@
 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
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa
+ lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0.
+ 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2.
+ 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0.
+ jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni
+ mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging
+ -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15.
+ jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons-
+ httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm
+ ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a
+ op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j
+ ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j
+ dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o
+ jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation
+ s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo
+ -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression-
+ 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java-
+ sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar 
+ gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s
+ dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2.
+ 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring
+ -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2
+ .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega
+ cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1.
+ 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo
+ gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp
+ ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a
+ nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka
+ -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-
+ 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.
+ 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F
+ inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j
+ ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s
+ pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja
+ va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso
+ n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j-
+ 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2.
+ jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3
+ .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1.
+ 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer
+ -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar
 Main-Class: org.well.mysql.sink.WellSink
 

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 13bc77c..5ec5295 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,46 +1,44 @@
 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
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa
+ lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0.
+ 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2.
+ 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0.
+ jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni
+ mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging
+ -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15.
+ jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons-
+ httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm
+ ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a
+ op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j
+ ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j
+ dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o
+ jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation
+ s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo
+ -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression-
+ 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java-
+ sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar 
+ gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s
+ dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2.
+ 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring
+ -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2
+ .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega
+ cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1.
+ 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo
+ gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp
+ ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a
+ nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka
+ -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-
+ 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.
+ 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F
+ inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j
+ ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s
+ pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja
+ va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso
+ n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j-
+ 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2.
+ jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3
+ .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1.
+ 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer
+ -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar
 Main-Class: org.well.mysql.sink.WellSink
 
diff --git a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
index 0f2b981..936f007 100644
--- a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
+++ b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
@@ -8,8 +8,8 @@
     NO_DATA("设备异常", -1),
     NORMAL("正常", 0),
     OVER_THRESH("浓度超限", 1),
-    MethaneFail("燃气探头采集失败", 2),
-    MethaneError("燃气探头数据异常", 3),
+    MethaneCommunicationFailure("燃气传感器通讯失败", 2),
+    MethaneError("燃气传感器异常", 3),
     MethaneUnknown("燃气未知异常", 4),
     OVER_THRESH1("一级浓度超限", 5),
     OVER_THRESH2("二级浓度超限", 6);

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 13bc77c..5ec5295 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,46 +1,44 @@
 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
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa
+ lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0.
+ 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2.
+ 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0.
+ jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni
+ mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging
+ -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15.
+ jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons-
+ httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm
+ ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a
+ op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j
+ ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j
+ dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o
+ jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation
+ s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo
+ -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression-
+ 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java-
+ sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar 
+ gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s
+ dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2.
+ 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring
+ -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2
+ .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega
+ cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1.
+ 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo
+ gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp
+ ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a
+ nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka
+ -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-
+ 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.
+ 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F
+ inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j
+ ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s
+ pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja
+ va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso
+ n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j-
+ 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2.
+ jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3
+ .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1.
+ 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer
+ -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar
 Main-Class: org.well.mysql.sink.WellSink
 
diff --git a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
index 0f2b981..936f007 100644
--- a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
+++ b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
@@ -8,8 +8,8 @@
     NO_DATA("设备异常", -1),
     NORMAL("正常", 0),
     OVER_THRESH("浓度超限", 1),
-    MethaneFail("燃气探头采集失败", 2),
-    MethaneError("燃气探头数据异常", 3),
+    MethaneCommunicationFailure("燃气传感器通讯失败", 2),
+    MethaneError("燃气传感器异常", 3),
     MethaneUnknown("燃气未知异常", 4),
     OVER_THRESH1("一级浓度超限", 5),
     OVER_THRESH2("二级浓度超限", 6);
diff --git a/src/main/java/org/well/well/domain/SysDept.java b/src/main/java/org/well/well/domain/SysDept.java
index 2b590f1..6755fad 100644
--- a/src/main/java/org/well/well/domain/SysDept.java
+++ b/src/main/java/org/well/well/domain/SysDept.java
@@ -40,12 +40,12 @@
     /**
      * 简称
      */
-    @Column(name ="simplename")
+    @Column(name ="SIMPLE_NAME")
     private String simplename;
     /**
      * 全称
      */
-    @Column(name ="fullname")
+    @Column(name ="FULL_NAME")
     private String fullname;
     /**
      * 提示
@@ -57,6 +57,11 @@
      */
     @Column(name ="version")
     private Integer version;
+    @Column(name ="IS_PARENT")
+
+    private Integer isParent;
+    @Column(name ="IP_SEGMENT")
+    private Integer ipSegment;
 
 
     @Column(name ="TENANT_ID")
@@ -133,4 +138,20 @@
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
+
+    public Integer getIsParent() {
+        return isParent;
+    }
+
+    public void setIsParent(Integer isParent) {
+        this.isParent = isParent;
+    }
+
+    public Integer getIpSegment() {
+        return ipSegment;
+    }
+
+    public void setIpSegment(Integer ipSegment) {
+        this.ipSegment = ipSegment;
+    }
 }

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 13bc77c..5ec5295 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,46 +1,44 @@
 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
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa
+ lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0.
+ 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2.
+ 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0.
+ jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni
+ mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging
+ -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15.
+ jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons-
+ httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm
+ ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a
+ op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j
+ ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j
+ dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o
+ jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation
+ s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo
+ -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression-
+ 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java-
+ sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar 
+ gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s
+ dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2.
+ 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring
+ -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2
+ .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega
+ cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1.
+ 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo
+ gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp
+ ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a
+ nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka
+ -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-
+ 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.
+ 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F
+ inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j
+ ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s
+ pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja
+ va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso
+ n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j-
+ 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2.
+ jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3
+ .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1.
+ 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer
+ -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar
 Main-Class: org.well.mysql.sink.WellSink
 
diff --git a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
index 0f2b981..936f007 100644
--- a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
+++ b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
@@ -8,8 +8,8 @@
     NO_DATA("设备异常", -1),
     NORMAL("正常", 0),
     OVER_THRESH("浓度超限", 1),
-    MethaneFail("燃气探头采集失败", 2),
-    MethaneError("燃气探头数据异常", 3),
+    MethaneCommunicationFailure("燃气传感器通讯失败", 2),
+    MethaneError("燃气传感器异常", 3),
     MethaneUnknown("燃气未知异常", 4),
     OVER_THRESH1("一级浓度超限", 5),
     OVER_THRESH2("二级浓度超限", 6);
diff --git a/src/main/java/org/well/well/domain/SysDept.java b/src/main/java/org/well/well/domain/SysDept.java
index 2b590f1..6755fad 100644
--- a/src/main/java/org/well/well/domain/SysDept.java
+++ b/src/main/java/org/well/well/domain/SysDept.java
@@ -40,12 +40,12 @@
     /**
      * 简称
      */
-    @Column(name ="simplename")
+    @Column(name ="SIMPLE_NAME")
     private String simplename;
     /**
      * 全称
      */
-    @Column(name ="fullname")
+    @Column(name ="FULL_NAME")
     private String fullname;
     /**
      * 提示
@@ -57,6 +57,11 @@
      */
     @Column(name ="version")
     private Integer version;
+    @Column(name ="IS_PARENT")
+
+    private Integer isParent;
+    @Column(name ="IP_SEGMENT")
+    private Integer ipSegment;
 
 
     @Column(name ="TENANT_ID")
@@ -133,4 +138,20 @@
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
+
+    public Integer getIsParent() {
+        return isParent;
+    }
+
+    public void setIsParent(Integer isParent) {
+        this.isParent = isParent;
+    }
+
+    public Integer getIpSegment() {
+        return ipSegment;
+    }
+
+    public void setIpSegment(Integer ipSegment) {
+        this.ipSegment = ipSegment;
+    }
 }
diff --git a/src/main/java/org/well/well/resp/H2SResponse.java b/src/main/java/org/well/well/resp/H2SResponse.java
index 79804b7..e85b834 100644
--- a/src/main/java/org/well/well/resp/H2SResponse.java
+++ b/src/main/java/org/well/well/resp/H2SResponse.java
@@ -5,19 +5,22 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.well.well.base.AbstractResponse;
+import org.well.well.base.DeviceTypeEnum;
+import org.well.well.manager.DeviceConfigManager;
 import org.well.well.manager.H2SManager;
 import org.well.well.manager.ImeiManager;
 
 public class H2SResponse extends AbstractResponse {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-    private static final String[] mType = {"Data", "Event", "StartupRequest"};
+    private static final String[] mType = {"Data", "Event", "SetResponse", "GetResponse", "StartupRequest"};
 
     @Override
     public void run() {
         ClassPathXmlApplicationContext ac = this.getAc();
         H2SManager h2SManager = ac.getBean(H2SManager.class);
         ImeiManager imeiManager = ac.getBean(ImeiManager.class);
+        DeviceConfigManager deviceConfigManager = ac.getBean(DeviceConfigManager.class);
         JSONObject json = JSONObject.fromObject(this.getContent());
         String devCode = json.get("devCode").toString();
         logger.info("--------RECEIVE:设备编号：" + devCode + "，上传数据：" + json.toString() + "-------");
@@ -28,9 +31,20 @@
             h2SManager.processAlarmData(jsonObject, devCode);
         } else if (mType[2].equals(json.get("mType"))) {//三码存储
             try {
-                String imei = jsonObject.get("imei").toString();
-                String iccid = jsonObject.get("iccid").toString();
-                imeiManager.saveData(devCode, imei, iccid);
+                if (DeviceTypeEnum.HydrogenSulfide.name().equals(json.get("devType"))) {
+                    if ("HydrogenSulfideConfigSuccess".equals(jsonObject.get("bType"))) {
+                        deviceConfigManager.updateStatus(devCode);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.error("--------ERROR:设备编号：" + devCode + "，更新参数下发状态失败-------");
+            }
+        }else if (mType[4].equals(json.get("mType"))) {//三码存储
+            try {
+                String imei = jsonObject.getString("imei");
+                String iccid = jsonObject.getString("iccid");
+                imeiManager.saveData(devCode,imei,iccid);
             } catch (Exception e) {
                 e.printStackTrace();
                 logger.error("--------ERROR:设备编号：" + devCode + "，更新参数下发状态失败-------");

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 13bc77c..5ec5295 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,46 +1,44 @@
 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
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa
+ lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0.
+ 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2.
+ 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0.
+ jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni
+ mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging
+ -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15.
+ jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons-
+ httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm
+ ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a
+ op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j
+ ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j
+ dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o
+ jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation
+ s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo
+ -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression-
+ 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java-
+ sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar 
+ gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s
+ dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2.
+ 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring
+ -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2
+ .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega
+ cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1.
+ 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo
+ gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp
+ ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a
+ nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka
+ -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-
+ 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.
+ 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F
+ inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j
+ ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s
+ pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja
+ va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso
+ n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j-
+ 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2.
+ jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3
+ .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1.
+ 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer
+ -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar
 Main-Class: org.well.mysql.sink.WellSink
 
diff --git a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
index 0f2b981..936f007 100644
--- a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
+++ b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
@@ -8,8 +8,8 @@
     NO_DATA("设备异常", -1),
     NORMAL("正常", 0),
     OVER_THRESH("浓度超限", 1),
-    MethaneFail("燃气探头采集失败", 2),
-    MethaneError("燃气探头数据异常", 3),
+    MethaneCommunicationFailure("燃气传感器通讯失败", 2),
+    MethaneError("燃气传感器异常", 3),
     MethaneUnknown("燃气未知异常", 4),
     OVER_THRESH1("一级浓度超限", 5),
     OVER_THRESH2("二级浓度超限", 6);
diff --git a/src/main/java/org/well/well/domain/SysDept.java b/src/main/java/org/well/well/domain/SysDept.java
index 2b590f1..6755fad 100644
--- a/src/main/java/org/well/well/domain/SysDept.java
+++ b/src/main/java/org/well/well/domain/SysDept.java
@@ -40,12 +40,12 @@
     /**
      * 简称
      */
-    @Column(name ="simplename")
+    @Column(name ="SIMPLE_NAME")
     private String simplename;
     /**
      * 全称
      */
-    @Column(name ="fullname")
+    @Column(name ="FULL_NAME")
     private String fullname;
     /**
      * 提示
@@ -57,6 +57,11 @@
      */
     @Column(name ="version")
     private Integer version;
+    @Column(name ="IS_PARENT")
+
+    private Integer isParent;
+    @Column(name ="IP_SEGMENT")
+    private Integer ipSegment;
 
 
     @Column(name ="TENANT_ID")
@@ -133,4 +138,20 @@
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
+
+    public Integer getIsParent() {
+        return isParent;
+    }
+
+    public void setIsParent(Integer isParent) {
+        this.isParent = isParent;
+    }
+
+    public Integer getIpSegment() {
+        return ipSegment;
+    }
+
+    public void setIpSegment(Integer ipSegment) {
+        this.ipSegment = ipSegment;
+    }
 }
diff --git a/src/main/java/org/well/well/resp/H2SResponse.java b/src/main/java/org/well/well/resp/H2SResponse.java
index 79804b7..e85b834 100644
--- a/src/main/java/org/well/well/resp/H2SResponse.java
+++ b/src/main/java/org/well/well/resp/H2SResponse.java
@@ -5,19 +5,22 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.well.well.base.AbstractResponse;
+import org.well.well.base.DeviceTypeEnum;
+import org.well.well.manager.DeviceConfigManager;
 import org.well.well.manager.H2SManager;
 import org.well.well.manager.ImeiManager;
 
 public class H2SResponse extends AbstractResponse {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-    private static final String[] mType = {"Data", "Event", "StartupRequest"};
+    private static final String[] mType = {"Data", "Event", "SetResponse", "GetResponse", "StartupRequest"};
 
     @Override
     public void run() {
         ClassPathXmlApplicationContext ac = this.getAc();
         H2SManager h2SManager = ac.getBean(H2SManager.class);
         ImeiManager imeiManager = ac.getBean(ImeiManager.class);
+        DeviceConfigManager deviceConfigManager = ac.getBean(DeviceConfigManager.class);
         JSONObject json = JSONObject.fromObject(this.getContent());
         String devCode = json.get("devCode").toString();
         logger.info("--------RECEIVE:设备编号：" + devCode + "，上传数据：" + json.toString() + "-------");
@@ -28,9 +31,20 @@
             h2SManager.processAlarmData(jsonObject, devCode);
         } else if (mType[2].equals(json.get("mType"))) {//三码存储
             try {
-                String imei = jsonObject.get("imei").toString();
-                String iccid = jsonObject.get("iccid").toString();
-                imeiManager.saveData(devCode, imei, iccid);
+                if (DeviceTypeEnum.HydrogenSulfide.name().equals(json.get("devType"))) {
+                    if ("HydrogenSulfideConfigSuccess".equals(jsonObject.get("bType"))) {
+                        deviceConfigManager.updateStatus(devCode);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.error("--------ERROR:设备编号：" + devCode + "，更新参数下发状态失败-------");
+            }
+        }else if (mType[4].equals(json.get("mType"))) {//三码存储
+            try {
+                String imei = jsonObject.getString("imei");
+                String iccid = jsonObject.getString("iccid");
+                imeiManager.saveData(devCode,imei,iccid);
             } catch (Exception e) {
                 e.printStackTrace();
                 logger.error("--------ERROR:设备编号：" + devCode + "，更新参数下发状态失败-------");
diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties
index 5838d5f..07b9872 100644
--- a/src/main/resources/wellSensor/application.properties
+++ b/src/main/resources/wellSensor/application.properties
@@ -89,7 +89,7 @@
 #============================================================================
 # log
 #============================================================================
-log.base=D://logs//sink.log
+log.base=C://logs//sink.log
 log.pattern.default=%d %5p [%t] %c:%L - %m%n
 log.console.jansi=true
 log.file.enable=true

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 13bc77c..5ec5295 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,46 +1,44 @@
 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
+Class-Path: commons-compiler-2.7.6.jar activemq-jms-pool-5.14.5.jar aopa
+ lliance-1.0.jar hibernate-validator-5.1.2.Final.jar spring-context-4.0.
+ 6.RELEASE.jar jackson-module-jaxb-annotations-2.4.2.jar spring-jms-3.2.
+ 8.RELEASE.jar jackson-core-asl-1.9.3.jar xml-apis-1.0.b2.jar lz4-1.3.0.
+ jar avro-1.7.3.jar servlet-api-2.5-20110124.jar guava-10.0.1.jar geroni
+ mo-jms_1.1_spec-1.1.1.jar hawtbuf-1.11.jar gson-2.2.2.jar jboss-logging
+ -3.1.3.GA.jar hibernate-jpa-2.1-api-1.0.0.Final.jar json-lib-2.4-jdk15.
+ jar jackson-jaxrs-json-provider-2.4.2.jar commons-dbcp-1.4.jar commons-
+ httpclient-3.1.jar jetty-6.1.26.jar spring-beans-4.0.6.RELEASE.jar comm
+ ons-io-2.4.jar hutool-captcha-4.6.0.jar commons-pool-1.5.4.jar spring-a
+ op-4.0.6.RELEASE.jar mina-core-2.0.4.jar jansi-1.11.jar joda-time-2.1.j
+ ar spring-retry-1.1.3.RELEASE.jar spring-web-4.0.6.RELEASE.jar spring-j
+ dbc-4.0.6.RELEASE.jar jsr305-1.3.9.jar hibernate-core-4.3.6.Final.jar o
+ jdbc6-11.1.0.7.0.jar avro-ipc-1.7.3.jar jstl-1.2.jar jackson-annotation
+ s-2.4.0.jar xbean-spring-4.2.jar spring-core-4.0.6.RELEASE.jar geronimo
+ -j2ee-management_1.1_spec-1.0.1.jar log4j-1.2.16.jar spring-expression-
+ 4.0.6.RELEASE.jar slf4j-log4j12-1.6.1.jar flume-ng-core-1.4.0.jar java-
+ sizeof-0.0.4.jar spring-tx-4.0.6.RELEASE.jar logback-classic-1.1.2.jar 
+ gexin-rp-fastjson-1.0.0.1.jar gexin-rp-sdk-base-4.0.0.28.jar gexin-rp-s
+ dk-http-4.1.0.3.jar gexin-rp-sdk-template-4.0.0.22.jar protobuf-java-2.
+ 5.0.jar commons-collections-3.2.1.jar activemq-client-5.14.5.jar spring
+ -messaging-4.3.3.RELEASE.jar commons-beanutils-1.9.2.jar httpclient-4.2
+ .1.jar netty-3.4.0.Final.jar classmate-1.0.0.jar activemq-openwire-lega
+ cy-5.14.5.jar jboss-logging-annotations-1.2.0.Beta1.jar geronimo-jta_1.
+ 0.1B_spec-1.0.1.jar commons-lang-2.5.jar commons-cli-1.2.jar commons-lo
+ gging-1.1.1.jar commons-pool2-2.4.2.jar slf4j-api-1.7.7.jar activemq-sp
+ ring-5.14.5.jar fastjson-1.1.15.jar dom4j-1.6.1.jar hibernate-commons-a
+ nnotations-4.0.5.Final.jar mysql-connector-java-8.0.27.jar spring-kafka
+ -1.1.1.RELEASE.jar spring-context-support-4.0.6.RELEASE.jar jetty-util-
+ 6.1.26.jar orika-core-1.4.5.jar log4jdbc-remix-0.2.7.jar hutool-core-4.
+ 6.0.jar concurrentlinkedhashmap-lru-1.2_jdk5.jar validation-api-1.1.0.F
+ inal.jar spring-webmvc-4.0.6.RELEASE.jar janino-2.7.6.jar antlr-2.7.7.j
+ ar ezmorph-1.0.6.jar logback-core-1.1.2.jar jboss-transaction-api_1.2_s
+ pec-1.0.0.Final.jar activemq-pool-5.14.5.jar velocity-1.7.jar snappy-ja
+ va-1.1.2.6.jar jackson-databind-2.4.2.jar flume-ng-sdk-1.4.0.jar jackso
+ n-jaxrs-base-2.4.2.jar flume-ng-configuration-1.4.0.jar jcl-over-slf4j-
+ 1.7.7.jar libthrift-0.7.0.jar commons-codec-1.9.jar jackson-core-2.4.2.
+ jar jul-to-slf4j-1.7.7.jar spring-orm-4.0.6.RELEASE.jar commons-lang3-3
+ .3.2.jar commons-fileupload-1.3.1.jar javassist-3.18.1-GA.jar jandex-1.
+ 1.0.Final.jar httpcore-4.2.1.jar jackson-mapper-asl-1.9.3.jar paranamer
+ -2.3.jar kafka-clients-0.11.0.1.jar activemq-broker-5.14.5.jar
 Main-Class: org.well.mysql.sink.WellSink
 
diff --git a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
index 0f2b981..936f007 100644
--- a/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
+++ b/src/main/java/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.java
@@ -8,8 +8,8 @@
     NO_DATA("设备异常", -1),
     NORMAL("正常", 0),
     OVER_THRESH("浓度超限", 1),
-    MethaneFail("燃气探头采集失败", 2),
-    MethaneError("燃气探头数据异常", 3),
+    MethaneCommunicationFailure("燃气传感器通讯失败", 2),
+    MethaneError("燃气传感器异常", 3),
     MethaneUnknown("燃气未知异常", 4),
     OVER_THRESH1("一级浓度超限", 5),
     OVER_THRESH2("二级浓度超限", 6);
diff --git a/src/main/java/org/well/well/domain/SysDept.java b/src/main/java/org/well/well/domain/SysDept.java
index 2b590f1..6755fad 100644
--- a/src/main/java/org/well/well/domain/SysDept.java
+++ b/src/main/java/org/well/well/domain/SysDept.java
@@ -40,12 +40,12 @@
     /**
      * 简称
      */
-    @Column(name ="simplename")
+    @Column(name ="SIMPLE_NAME")
     private String simplename;
     /**
      * 全称
      */
-    @Column(name ="fullname")
+    @Column(name ="FULL_NAME")
     private String fullname;
     /**
      * 提示
@@ -57,6 +57,11 @@
      */
     @Column(name ="version")
     private Integer version;
+    @Column(name ="IS_PARENT")
+
+    private Integer isParent;
+    @Column(name ="IP_SEGMENT")
+    private Integer ipSegment;
 
 
     @Column(name ="TENANT_ID")
@@ -133,4 +138,20 @@
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
+
+    public Integer getIsParent() {
+        return isParent;
+    }
+
+    public void setIsParent(Integer isParent) {
+        this.isParent = isParent;
+    }
+
+    public Integer getIpSegment() {
+        return ipSegment;
+    }
+
+    public void setIpSegment(Integer ipSegment) {
+        this.ipSegment = ipSegment;
+    }
 }
diff --git a/src/main/java/org/well/well/resp/H2SResponse.java b/src/main/java/org/well/well/resp/H2SResponse.java
index 79804b7..e85b834 100644
--- a/src/main/java/org/well/well/resp/H2SResponse.java
+++ b/src/main/java/org/well/well/resp/H2SResponse.java
@@ -5,19 +5,22 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.well.well.base.AbstractResponse;
+import org.well.well.base.DeviceTypeEnum;
+import org.well.well.manager.DeviceConfigManager;
 import org.well.well.manager.H2SManager;
 import org.well.well.manager.ImeiManager;
 
 public class H2SResponse extends AbstractResponse {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-    private static final String[] mType = {"Data", "Event", "StartupRequest"};
+    private static final String[] mType = {"Data", "Event", "SetResponse", "GetResponse", "StartupRequest"};
 
     @Override
     public void run() {
         ClassPathXmlApplicationContext ac = this.getAc();
         H2SManager h2SManager = ac.getBean(H2SManager.class);
         ImeiManager imeiManager = ac.getBean(ImeiManager.class);
+        DeviceConfigManager deviceConfigManager = ac.getBean(DeviceConfigManager.class);
         JSONObject json = JSONObject.fromObject(this.getContent());
         String devCode = json.get("devCode").toString();
         logger.info("--------RECEIVE:设备编号：" + devCode + "，上传数据：" + json.toString() + "-------");
@@ -28,9 +31,20 @@
             h2SManager.processAlarmData(jsonObject, devCode);
         } else if (mType[2].equals(json.get("mType"))) {//三码存储
             try {
-                String imei = jsonObject.get("imei").toString();
-                String iccid = jsonObject.get("iccid").toString();
-                imeiManager.saveData(devCode, imei, iccid);
+                if (DeviceTypeEnum.HydrogenSulfide.name().equals(json.get("devType"))) {
+                    if ("HydrogenSulfideConfigSuccess".equals(jsonObject.get("bType"))) {
+                        deviceConfigManager.updateStatus(devCode);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.error("--------ERROR:设备编号：" + devCode + "，更新参数下发状态失败-------");
+            }
+        }else if (mType[4].equals(json.get("mType"))) {//三码存储
+            try {
+                String imei = jsonObject.getString("imei");
+                String iccid = jsonObject.getString("iccid");
+                imeiManager.saveData(devCode,imei,iccid);
             } catch (Exception e) {
                 e.printStackTrace();
                 logger.error("--------ERROR:设备编号：" + devCode + "，更新参数下发状态失败-------");
diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties
index 5838d5f..07b9872 100644
--- a/src/main/resources/wellSensor/application.properties
+++ b/src/main/resources/wellSensor/application.properties
@@ -89,7 +89,7 @@
 #============================================================================
 # log
 #============================================================================
-log.base=D://logs//sink.log
+log.base=C://logs//sink.log
 log.pattern.default=%d %5p [%t] %c:%L - %m%n
 log.console.jansi=true
 log.file.enable=true
diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties
index 5838d5f..07b9872 100644
--- a/target/classes/wellSensor/application.properties
+++ b/target/classes/wellSensor/application.properties
@@ -89,7 +89,7 @@
 #============================================================================
 # log
 #============================================================================
-log.base=D://logs//sink.log
+log.base=C://logs//sink.log
 log.pattern.default=%d %5p [%t] %c:%L - %m%n
 log.console.jansi=true
 log.file.enable=true