diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bde2282..523e99c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,395 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b1b64b7-240e-4bb5-a60f-e8f40a5f1f86" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/ojdbc6_11_1_0_7_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRemoveMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConWorkOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRemoveMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRequestMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConWorkOrderManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bin/ojdbc6-11.1.0.7.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/smartfox_info.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PgInterface.iml" beforeDir="false" afterPath="$PROJECT_DIR$/PgInterface.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstruction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstructionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgCsDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgCsDocumentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgCsDocumentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/auth/AuthFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/Cache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/CacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/LocalCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/MapCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/RemoteCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/CsvExportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/Exportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/TableModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailConsumer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailFacade.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailStore.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MemoryMailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/rest/RestFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/FileStoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/MultipartFileResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityCreatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityRemovedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityUpdatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao$SynchronizationNotification.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateEntityDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernatePagingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/MatchType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionDefinition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/RecoverableSessionFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SessionFactoryWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionSynchronization.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/StatisticsWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionPool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/MockHttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/httpURL.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/i18n/AcceptLanguageHeaderFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceChecker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceProxy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceServiceFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/MockDataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/JulHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/ResourceExistsPropertyDefiner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGeneratorImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/BeanMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/page/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$VirtualFilterChain.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/GetFileServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/PathHttpServletRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilterConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServletConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ServletFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$AllPassUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$EqualsUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$PrefixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$SuffixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationPropertiesFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/DateConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/MessageHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BaseDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ConvertUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/EncodeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/HttpClientUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/IoUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonTool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/PropertiesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RandomCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/configProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCh4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgO2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgSh.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgTempHum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCh4Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryTempDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgO2Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgShDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgTempHumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCh4Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCoManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgO2Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgShManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgTempHumManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarm.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarmType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDevice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDeviceType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgEquipment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPartition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPipeLine.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgRoad.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PipeGallery.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgEquipmentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPartitionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgRoadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgEquipmentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPartitionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPipeLineManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgRoadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PipeGalleryManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/apiTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGInOutRecDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGTagMacDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGInOutRecManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGTagMacManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAlarmRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAuthority.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgPerson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgMaintainType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAuthorityDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgLogDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgRoleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAuthorityManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgLogManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgRoleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgUserManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/domain/PgReservePlan.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmLinkRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRuleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTjRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAuthorityRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCh4Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCoRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCsDocumentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgEquipmentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgPersonRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgStatusRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgLogRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintainTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgO2Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgOverViewRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPartitionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPipeLineRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgReservePlanRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoadRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgShRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgTempHumRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgUserRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PipeGalleryRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/pgStatisticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/test/apiTestTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/console.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/file.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/inspektr.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/log4jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/properties.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-bridge.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-cache.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-filter.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-hibernate.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-service.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-springmvc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/taskConfig-applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -423,59 +40,64 @@
     <session id="-697639591">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.16" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="68" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="8" />
+          <entry key="java" value="78" />
+          <entry key="properties" value="4" />
+          <entry key="xml" value="9" />
           <entry key="xsd" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="68" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="11" />
+          <entry key="JAVA" value="78" />
+          <entry key="Properties" value="4" />
+          <entry key="XML" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2977" />
+          <entry key="java" value="3251" />
+          <entry key="txt" value="20" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2977" />
+          <entry key="JAVA" value="3251" />
+          <entry key="PLAIN_TEXT" value="20" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-              <folding>
-                <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-                <element signature="e#2267#2269#0" />
-                <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-                <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-              </folding>
+            <state relative-caret-position="307">
+              <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -503,6 +125,7 @@
       <find>compositeFilter</find>
       <find>PG_CON_REMOVE_MSG</find>
       <find>oracle</find>
+      <find>pgdevice0_</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -520,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" />
@@ -528,6 +150,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
       </list>
     </option>
   </component>
@@ -571,10 +198,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="578" />
-    <option name="y" value="18" />
-    <option name="width" value="741" />
-    <option name="height" value="659" />
+    <option name="x" value="10" />
+    <option name="y" value="20" />
+    <option name="width" value="1346" />
+    <option name="height" value="688" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -582,8 +209,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -633,7 +261,25 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="devData" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -643,27 +289,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -684,13 +310,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583481424174" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583491628370" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../pgdsc" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -878,18 +503,28 @@
       <updated>1583376035104</updated>
       <workItem from="1583376038228" duration="4767000" />
       <workItem from="1583390525399" duration="11491000" />
-      <workItem from="1583455718406" duration="17586000" />
+      <workItem from="1583455718406" duration="26205000" />
+      <workItem from="1583648679095" duration="1231000" />
+      <workItem from="1583719625806" duration="1022000" />
     </task>
+    <task id="LOCAL-00001" summary="添加分区定位接口">
+      <created>1583481566842</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1583481566842</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33844000" />
+    <option name="totallyTimeSpent" value="44716000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21558245" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -900,7 +535,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5829228" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.50246304" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -965,14 +600,15 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="添加分区定位接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加分区定位接口" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2332">
           <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,9 +623,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="449">
           <caret line="236" column="5" lean-forward="true" selection-start-line="236" selection-start-column="5" selection-end-line="236" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,23 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="185">
           <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="205" column="60" lean-forward="true" selection-start-line="205" selection-start-column="60" selection-end-line="205" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="50" column="56" lean-forward="true" selection-start-line="50" selection-start-column="56" selection-end-line="50" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -1021,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="25" column="61" selection-start-line="25" selection-start-column="48" selection-end-line="25" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1031,19 +644,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="18" column="75" selection-start-line="18" selection-start-column="63" selection-end-line="18" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <folding>
-            <element signature="e#0#3513#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-726" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.java">
@@ -1067,24 +673,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="137" column="39" lean-forward="true" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
-          <folding>
-            <element signature="method#query#0;class#PGInOutRecRs#0" />
-            <element signature="method#getRecentPosition#0;class#PGInOutRecRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="e#3371#3383#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1092,9 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1102,9 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1109">
           <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1112,19 +698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#597#598#0" expanded="true" />
-            <element signature="e#626#627#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -1156,21 +729,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="107" column="32" lean-forward="true" selection-start-line="107" selection-start-column="32" selection-end-line="107" selection-end-column="32" />
-          <folding>
-            <element signature="method#getAllMac#0;class#TagmacRun#0" />
-            <element signature="method#getViaHostId#0;class#TagmacRun#0" />
-            <element signature="method#GetTagStatus#0;class#TagmacRun#0" />
-            <element signature="method#getMinInTime#0;class#TagmacRun#0" />
-            <element signature="method#postInOut#0;class#TagmacRun#0" />
-            <element signature="method#main#0;class#TagmacRun#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="163">
@@ -1178,13 +736,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1220,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="348">
@@ -1238,9 +782,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1255,13 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="7" column="52" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#965#966#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1052#1053#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1269,13 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
           <caret line="7" column="94" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="94" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1383#1384#0" expanded="true" />
-            <element signature="e#1408#1409#0" expanded="true" />
-            <element signature="e#1442#1443#0" expanded="true" />
-            <element signature="e#1470#1471#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1286,18 +813,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="68" lean-forward="true" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-          <folding>
-            <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-            <element signature="e#2267#2269#0" />
-            <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-            <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="131" column="51" lean-forward="true" selection-start-line="131" selection-start-column="51" selection-end-line="131" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="233" column="55" lean-forward="true" selection-start-line="233" selection-start-column="55" selection-end-line="233" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="136" column="28" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
         </state>
       </provider>
     </entry>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bde2282..523e99c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,395 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b1b64b7-240e-4bb5-a60f-e8f40a5f1f86" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/ojdbc6_11_1_0_7_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRemoveMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConWorkOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRemoveMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRequestMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConWorkOrderManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bin/ojdbc6-11.1.0.7.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/smartfox_info.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PgInterface.iml" beforeDir="false" afterPath="$PROJECT_DIR$/PgInterface.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstruction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstructionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgCsDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgCsDocumentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgCsDocumentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/auth/AuthFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/Cache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/CacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/LocalCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/MapCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/RemoteCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/CsvExportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/Exportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/TableModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailConsumer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailFacade.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailStore.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MemoryMailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/rest/RestFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/FileStoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/MultipartFileResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityCreatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityRemovedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityUpdatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao$SynchronizationNotification.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateEntityDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernatePagingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/MatchType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionDefinition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/RecoverableSessionFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SessionFactoryWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionSynchronization.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/StatisticsWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionPool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/MockHttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/httpURL.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/i18n/AcceptLanguageHeaderFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceChecker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceProxy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceServiceFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/MockDataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/JulHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/ResourceExistsPropertyDefiner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGeneratorImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/BeanMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/page/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$VirtualFilterChain.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/GetFileServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/PathHttpServletRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilterConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServletConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ServletFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$AllPassUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$EqualsUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$PrefixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$SuffixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationPropertiesFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/DateConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/MessageHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BaseDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ConvertUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/EncodeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/HttpClientUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/IoUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonTool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/PropertiesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RandomCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/configProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCh4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgO2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgSh.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgTempHum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCh4Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryTempDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgO2Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgShDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgTempHumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCh4Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCoManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgO2Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgShManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgTempHumManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarm.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarmType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDevice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDeviceType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgEquipment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPartition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPipeLine.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgRoad.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PipeGallery.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgEquipmentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPartitionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgRoadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgEquipmentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPartitionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPipeLineManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgRoadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PipeGalleryManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/apiTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGInOutRecDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGTagMacDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGInOutRecManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGTagMacManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAlarmRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAuthority.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgPerson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgMaintainType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAuthorityDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgLogDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgRoleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAuthorityManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgLogManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgRoleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgUserManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/domain/PgReservePlan.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmLinkRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRuleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTjRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAuthorityRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCh4Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCoRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCsDocumentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgEquipmentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgPersonRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgStatusRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgLogRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintainTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgO2Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgOverViewRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPartitionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPipeLineRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgReservePlanRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoadRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgShRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgTempHumRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgUserRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PipeGalleryRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/pgStatisticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/test/apiTestTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/console.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/file.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/inspektr.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/log4jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/properties.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-bridge.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-cache.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-filter.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-hibernate.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-service.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-springmvc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/taskConfig-applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -423,59 +40,64 @@
     <session id="-697639591">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.16" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="68" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="8" />
+          <entry key="java" value="78" />
+          <entry key="properties" value="4" />
+          <entry key="xml" value="9" />
           <entry key="xsd" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="68" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="11" />
+          <entry key="JAVA" value="78" />
+          <entry key="Properties" value="4" />
+          <entry key="XML" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2977" />
+          <entry key="java" value="3251" />
+          <entry key="txt" value="20" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2977" />
+          <entry key="JAVA" value="3251" />
+          <entry key="PLAIN_TEXT" value="20" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-              <folding>
-                <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-                <element signature="e#2267#2269#0" />
-                <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-                <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-              </folding>
+            <state relative-caret-position="307">
+              <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -503,6 +125,7 @@
       <find>compositeFilter</find>
       <find>PG_CON_REMOVE_MSG</find>
       <find>oracle</find>
+      <find>pgdevice0_</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -520,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" />
@@ -528,6 +150,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
       </list>
     </option>
   </component>
@@ -571,10 +198,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="578" />
-    <option name="y" value="18" />
-    <option name="width" value="741" />
-    <option name="height" value="659" />
+    <option name="x" value="10" />
+    <option name="y" value="20" />
+    <option name="width" value="1346" />
+    <option name="height" value="688" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -582,8 +209,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -633,7 +261,25 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="devData" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -643,27 +289,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -684,13 +310,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583481424174" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583491628370" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../pgdsc" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -878,18 +503,28 @@
       <updated>1583376035104</updated>
       <workItem from="1583376038228" duration="4767000" />
       <workItem from="1583390525399" duration="11491000" />
-      <workItem from="1583455718406" duration="17586000" />
+      <workItem from="1583455718406" duration="26205000" />
+      <workItem from="1583648679095" duration="1231000" />
+      <workItem from="1583719625806" duration="1022000" />
     </task>
+    <task id="LOCAL-00001" summary="添加分区定位接口">
+      <created>1583481566842</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1583481566842</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33844000" />
+    <option name="totallyTimeSpent" value="44716000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21558245" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -900,7 +535,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5829228" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.50246304" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -965,14 +600,15 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="添加分区定位接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加分区定位接口" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2332">
           <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,9 +623,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="449">
           <caret line="236" column="5" lean-forward="true" selection-start-line="236" selection-start-column="5" selection-end-line="236" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,23 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="185">
           <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="205" column="60" lean-forward="true" selection-start-line="205" selection-start-column="60" selection-end-line="205" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="50" column="56" lean-forward="true" selection-start-line="50" selection-start-column="56" selection-end-line="50" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -1021,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="25" column="61" selection-start-line="25" selection-start-column="48" selection-end-line="25" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1031,19 +644,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="18" column="75" selection-start-line="18" selection-start-column="63" selection-end-line="18" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <folding>
-            <element signature="e#0#3513#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-726" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.java">
@@ -1067,24 +673,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="137" column="39" lean-forward="true" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
-          <folding>
-            <element signature="method#query#0;class#PGInOutRecRs#0" />
-            <element signature="method#getRecentPosition#0;class#PGInOutRecRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="e#3371#3383#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1092,9 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1102,9 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1109">
           <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1112,19 +698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#597#598#0" expanded="true" />
-            <element signature="e#626#627#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -1156,21 +729,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="107" column="32" lean-forward="true" selection-start-line="107" selection-start-column="32" selection-end-line="107" selection-end-column="32" />
-          <folding>
-            <element signature="method#getAllMac#0;class#TagmacRun#0" />
-            <element signature="method#getViaHostId#0;class#TagmacRun#0" />
-            <element signature="method#GetTagStatus#0;class#TagmacRun#0" />
-            <element signature="method#getMinInTime#0;class#TagmacRun#0" />
-            <element signature="method#postInOut#0;class#TagmacRun#0" />
-            <element signature="method#main#0;class#TagmacRun#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="163">
@@ -1178,13 +736,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1220,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="348">
@@ -1238,9 +782,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1255,13 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="7" column="52" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#965#966#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1052#1053#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1269,13 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
           <caret line="7" column="94" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="94" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1383#1384#0" expanded="true" />
-            <element signature="e#1408#1409#0" expanded="true" />
-            <element signature="e#1442#1443#0" expanded="true" />
-            <element signature="e#1470#1471#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1286,18 +813,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="68" lean-forward="true" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-          <folding>
-            <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-            <element signature="e#2267#2269#0" />
-            <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-            <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="131" column="51" lean-forward="true" selection-start-line="131" selection-start-column="51" selection-end-line="131" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="233" column="55" lean-forward="true" selection-start-line="233" selection-start-column="55" selection-end-line="233" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="136" column="28" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
index ad9d569..d3bc27f 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
@@ -20,7 +20,9 @@
     private Long id;
     private String alarmValue;//报警值
     private Date alarmDate;//报警时间
+    private Date logTime;//消警时间
     private String description;//描述
+    private String logDesc;//消警描述
     private PgAlarmType alarmTypeId;//报警类型
     private PgDevice alarmDevId;//报警设备
     private PgUser userId;//责任人
@@ -55,6 +57,24 @@
         this.alarmDate = alarmDate;
     }
 
+    @Column(name="LOG_TIME")
+    public Date getLogTime() {
+        return logTime;
+    }
+
+    public void setLogTime(Date logTime) {
+        this.logTime = logTime;
+    }
+
+    @Column(name="LOG_DESC")
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
     @Column(name = "DESCRIPTION")
     public String getDescription() {
         return description;

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bde2282..523e99c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,395 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b1b64b7-240e-4bb5-a60f-e8f40a5f1f86" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/ojdbc6_11_1_0_7_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRemoveMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConWorkOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRemoveMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRequestMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConWorkOrderManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bin/ojdbc6-11.1.0.7.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/smartfox_info.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PgInterface.iml" beforeDir="false" afterPath="$PROJECT_DIR$/PgInterface.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstruction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstructionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgCsDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgCsDocumentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgCsDocumentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/auth/AuthFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/Cache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/CacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/LocalCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/MapCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/RemoteCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/CsvExportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/Exportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/TableModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailConsumer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailFacade.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailStore.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MemoryMailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/rest/RestFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/FileStoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/MultipartFileResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityCreatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityRemovedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityUpdatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao$SynchronizationNotification.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateEntityDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernatePagingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/MatchType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionDefinition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/RecoverableSessionFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SessionFactoryWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionSynchronization.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/StatisticsWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionPool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/MockHttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/httpURL.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/i18n/AcceptLanguageHeaderFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceChecker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceProxy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceServiceFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/MockDataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/JulHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/ResourceExistsPropertyDefiner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGeneratorImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/BeanMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/page/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$VirtualFilterChain.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/GetFileServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/PathHttpServletRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilterConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServletConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ServletFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$AllPassUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$EqualsUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$PrefixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$SuffixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationPropertiesFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/DateConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/MessageHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BaseDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ConvertUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/EncodeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/HttpClientUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/IoUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonTool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/PropertiesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RandomCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/configProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCh4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgO2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgSh.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgTempHum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCh4Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryTempDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgO2Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgShDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgTempHumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCh4Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCoManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgO2Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgShManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgTempHumManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarm.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarmType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDevice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDeviceType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgEquipment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPartition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPipeLine.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgRoad.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PipeGallery.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgEquipmentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPartitionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgRoadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgEquipmentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPartitionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPipeLineManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgRoadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PipeGalleryManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/apiTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGInOutRecDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGTagMacDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGInOutRecManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGTagMacManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAlarmRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAuthority.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgPerson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgMaintainType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAuthorityDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgLogDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgRoleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAuthorityManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgLogManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgRoleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgUserManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/domain/PgReservePlan.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmLinkRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRuleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTjRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAuthorityRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCh4Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCoRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCsDocumentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgEquipmentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgPersonRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgStatusRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgLogRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintainTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgO2Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgOverViewRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPartitionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPipeLineRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgReservePlanRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoadRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgShRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgTempHumRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgUserRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PipeGalleryRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/pgStatisticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/test/apiTestTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/console.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/file.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/inspektr.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/log4jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/properties.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-bridge.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-cache.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-filter.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-hibernate.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-service.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-springmvc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/taskConfig-applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -423,59 +40,64 @@
     <session id="-697639591">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.16" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="68" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="8" />
+          <entry key="java" value="78" />
+          <entry key="properties" value="4" />
+          <entry key="xml" value="9" />
           <entry key="xsd" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="68" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="11" />
+          <entry key="JAVA" value="78" />
+          <entry key="Properties" value="4" />
+          <entry key="XML" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2977" />
+          <entry key="java" value="3251" />
+          <entry key="txt" value="20" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2977" />
+          <entry key="JAVA" value="3251" />
+          <entry key="PLAIN_TEXT" value="20" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-              <folding>
-                <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-                <element signature="e#2267#2269#0" />
-                <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-                <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-              </folding>
+            <state relative-caret-position="307">
+              <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -503,6 +125,7 @@
       <find>compositeFilter</find>
       <find>PG_CON_REMOVE_MSG</find>
       <find>oracle</find>
+      <find>pgdevice0_</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -520,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" />
@@ -528,6 +150,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
       </list>
     </option>
   </component>
@@ -571,10 +198,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="578" />
-    <option name="y" value="18" />
-    <option name="width" value="741" />
-    <option name="height" value="659" />
+    <option name="x" value="10" />
+    <option name="y" value="20" />
+    <option name="width" value="1346" />
+    <option name="height" value="688" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -582,8 +209,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -633,7 +261,25 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="devData" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -643,27 +289,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -684,13 +310,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583481424174" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583491628370" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../pgdsc" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -878,18 +503,28 @@
       <updated>1583376035104</updated>
       <workItem from="1583376038228" duration="4767000" />
       <workItem from="1583390525399" duration="11491000" />
-      <workItem from="1583455718406" duration="17586000" />
+      <workItem from="1583455718406" duration="26205000" />
+      <workItem from="1583648679095" duration="1231000" />
+      <workItem from="1583719625806" duration="1022000" />
     </task>
+    <task id="LOCAL-00001" summary="添加分区定位接口">
+      <created>1583481566842</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1583481566842</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33844000" />
+    <option name="totallyTimeSpent" value="44716000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21558245" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -900,7 +535,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5829228" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.50246304" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -965,14 +600,15 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="添加分区定位接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加分区定位接口" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2332">
           <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,9 +623,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="449">
           <caret line="236" column="5" lean-forward="true" selection-start-line="236" selection-start-column="5" selection-end-line="236" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,23 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="185">
           <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="205" column="60" lean-forward="true" selection-start-line="205" selection-start-column="60" selection-end-line="205" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="50" column="56" lean-forward="true" selection-start-line="50" selection-start-column="56" selection-end-line="50" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -1021,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="25" column="61" selection-start-line="25" selection-start-column="48" selection-end-line="25" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1031,19 +644,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="18" column="75" selection-start-line="18" selection-start-column="63" selection-end-line="18" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <folding>
-            <element signature="e#0#3513#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-726" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.java">
@@ -1067,24 +673,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="137" column="39" lean-forward="true" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
-          <folding>
-            <element signature="method#query#0;class#PGInOutRecRs#0" />
-            <element signature="method#getRecentPosition#0;class#PGInOutRecRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="e#3371#3383#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1092,9 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1102,9 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1109">
           <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1112,19 +698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#597#598#0" expanded="true" />
-            <element signature="e#626#627#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -1156,21 +729,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="107" column="32" lean-forward="true" selection-start-line="107" selection-start-column="32" selection-end-line="107" selection-end-column="32" />
-          <folding>
-            <element signature="method#getAllMac#0;class#TagmacRun#0" />
-            <element signature="method#getViaHostId#0;class#TagmacRun#0" />
-            <element signature="method#GetTagStatus#0;class#TagmacRun#0" />
-            <element signature="method#getMinInTime#0;class#TagmacRun#0" />
-            <element signature="method#postInOut#0;class#TagmacRun#0" />
-            <element signature="method#main#0;class#TagmacRun#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="163">
@@ -1178,13 +736,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1220,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="348">
@@ -1238,9 +782,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1255,13 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="7" column="52" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#965#966#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1052#1053#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1269,13 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
           <caret line="7" column="94" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="94" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1383#1384#0" expanded="true" />
-            <element signature="e#1408#1409#0" expanded="true" />
-            <element signature="e#1442#1443#0" expanded="true" />
-            <element signature="e#1470#1471#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1286,18 +813,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="68" lean-forward="true" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-          <folding>
-            <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-            <element signature="e#2267#2269#0" />
-            <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-            <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="131" column="51" lean-forward="true" selection-start-line="131" selection-start-column="51" selection-end-line="131" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="233" column="55" lean-forward="true" selection-start-line="233" selection-start-column="55" selection-end-line="233" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="136" column="28" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
index ad9d569..d3bc27f 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
@@ -20,7 +20,9 @@
     private Long id;
     private String alarmValue;//报警值
     private Date alarmDate;//报警时间
+    private Date logTime;//消警时间
     private String description;//描述
+    private String logDesc;//消警描述
     private PgAlarmType alarmTypeId;//报警类型
     private PgDevice alarmDevId;//报警设备
     private PgUser userId;//责任人
@@ -55,6 +57,24 @@
         this.alarmDate = alarmDate;
     }
 
+    @Column(name="LOG_TIME")
+    public Date getLogTime() {
+        return logTime;
+    }
+
+    public void setLogTime(Date logTime) {
+        this.logTime = logTime;
+    }
+
+    @Column(name="LOG_DESC")
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
     @Column(name = "DESCRIPTION")
     public String getDescription() {
         return description;
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 6a8e293..92a6b47 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -73,7 +73,7 @@
     public int getAlarmNum(String isDevFault) {
         String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm ";
 
-        if(isDevFault!=null) {
+        if(StringUtils.isNotBlank(isDevFault)) {
             if (isDevFault.equals("true"))
                 hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
             else
@@ -140,15 +140,14 @@
 
         String hql="from PgAlarm a where a.active = 1";
 
-        if(isDevFault!=null)
+        if(StringUtils.isNotBlank(isDevFault))
             if(isDevFault.equals("true"))
                 hql+=" and a.alarmTypeId = " + pgAlarmType.getId();
             else if(isDevFault.equals("false"))
                 hql+=" and a.alarmTypeId != " + pgAlarmType.getId();
         Query query=this.getSession().createQuery(hql);
-        List<PgAlarm>pgAlarmList=query.list();
 
-        //List<PgAlarm> pgAlarmList = (List<PgAlarm>)criteria.list();
+        List<PgAlarm>pgAlarmList=query.list();
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         for(PgAlarm pgAlarm : pgAlarmList)
         {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bde2282..523e99c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,395 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b1b64b7-240e-4bb5-a60f-e8f40a5f1f86" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/ojdbc6_11_1_0_7_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRemoveMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConWorkOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRemoveMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRequestMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConWorkOrderManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bin/ojdbc6-11.1.0.7.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/smartfox_info.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PgInterface.iml" beforeDir="false" afterPath="$PROJECT_DIR$/PgInterface.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstruction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstructionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgCsDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgCsDocumentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgCsDocumentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/auth/AuthFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/Cache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/CacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/LocalCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/MapCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/RemoteCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/CsvExportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/Exportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/TableModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailConsumer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailFacade.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailStore.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MemoryMailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/rest/RestFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/FileStoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/MultipartFileResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityCreatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityRemovedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityUpdatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao$SynchronizationNotification.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateEntityDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernatePagingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/MatchType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionDefinition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/RecoverableSessionFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SessionFactoryWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionSynchronization.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/StatisticsWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionPool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/MockHttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/httpURL.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/i18n/AcceptLanguageHeaderFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceChecker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceProxy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceServiceFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/MockDataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/JulHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/ResourceExistsPropertyDefiner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGeneratorImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/BeanMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/page/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$VirtualFilterChain.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/GetFileServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/PathHttpServletRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilterConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServletConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ServletFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$AllPassUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$EqualsUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$PrefixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$SuffixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationPropertiesFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/DateConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/MessageHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BaseDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ConvertUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/EncodeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/HttpClientUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/IoUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonTool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/PropertiesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RandomCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/configProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCh4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgO2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgSh.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgTempHum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCh4Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryTempDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgO2Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgShDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgTempHumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCh4Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCoManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgO2Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgShManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgTempHumManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarm.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarmType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDevice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDeviceType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgEquipment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPartition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPipeLine.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgRoad.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PipeGallery.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgEquipmentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPartitionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgRoadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgEquipmentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPartitionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPipeLineManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgRoadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PipeGalleryManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/apiTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGInOutRecDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGTagMacDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGInOutRecManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGTagMacManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAlarmRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAuthority.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgPerson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgMaintainType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAuthorityDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgLogDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgRoleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAuthorityManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgLogManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgRoleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgUserManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/domain/PgReservePlan.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmLinkRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRuleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTjRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAuthorityRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCh4Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCoRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCsDocumentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgEquipmentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgPersonRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgStatusRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgLogRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintainTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgO2Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgOverViewRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPartitionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPipeLineRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgReservePlanRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoadRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgShRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgTempHumRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgUserRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PipeGalleryRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/pgStatisticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/test/apiTestTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/console.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/file.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/inspektr.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/log4jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/properties.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-bridge.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-cache.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-filter.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-hibernate.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-service.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-springmvc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/taskConfig-applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -423,59 +40,64 @@
     <session id="-697639591">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.16" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="68" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="8" />
+          <entry key="java" value="78" />
+          <entry key="properties" value="4" />
+          <entry key="xml" value="9" />
           <entry key="xsd" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="68" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="11" />
+          <entry key="JAVA" value="78" />
+          <entry key="Properties" value="4" />
+          <entry key="XML" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2977" />
+          <entry key="java" value="3251" />
+          <entry key="txt" value="20" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2977" />
+          <entry key="JAVA" value="3251" />
+          <entry key="PLAIN_TEXT" value="20" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-              <folding>
-                <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-                <element signature="e#2267#2269#0" />
-                <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-                <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-              </folding>
+            <state relative-caret-position="307">
+              <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -503,6 +125,7 @@
       <find>compositeFilter</find>
       <find>PG_CON_REMOVE_MSG</find>
       <find>oracle</find>
+      <find>pgdevice0_</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -520,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" />
@@ -528,6 +150,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
       </list>
     </option>
   </component>
@@ -571,10 +198,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="578" />
-    <option name="y" value="18" />
-    <option name="width" value="741" />
-    <option name="height" value="659" />
+    <option name="x" value="10" />
+    <option name="y" value="20" />
+    <option name="width" value="1346" />
+    <option name="height" value="688" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -582,8 +209,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -633,7 +261,25 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="devData" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -643,27 +289,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -684,13 +310,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583481424174" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583491628370" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../pgdsc" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -878,18 +503,28 @@
       <updated>1583376035104</updated>
       <workItem from="1583376038228" duration="4767000" />
       <workItem from="1583390525399" duration="11491000" />
-      <workItem from="1583455718406" duration="17586000" />
+      <workItem from="1583455718406" duration="26205000" />
+      <workItem from="1583648679095" duration="1231000" />
+      <workItem from="1583719625806" duration="1022000" />
     </task>
+    <task id="LOCAL-00001" summary="添加分区定位接口">
+      <created>1583481566842</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1583481566842</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33844000" />
+    <option name="totallyTimeSpent" value="44716000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21558245" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -900,7 +535,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5829228" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.50246304" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -965,14 +600,15 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="添加分区定位接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加分区定位接口" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2332">
           <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,9 +623,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="449">
           <caret line="236" column="5" lean-forward="true" selection-start-line="236" selection-start-column="5" selection-end-line="236" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,23 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="185">
           <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="205" column="60" lean-forward="true" selection-start-line="205" selection-start-column="60" selection-end-line="205" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="50" column="56" lean-forward="true" selection-start-line="50" selection-start-column="56" selection-end-line="50" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -1021,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="25" column="61" selection-start-line="25" selection-start-column="48" selection-end-line="25" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1031,19 +644,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="18" column="75" selection-start-line="18" selection-start-column="63" selection-end-line="18" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <folding>
-            <element signature="e#0#3513#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-726" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.java">
@@ -1067,24 +673,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="137" column="39" lean-forward="true" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
-          <folding>
-            <element signature="method#query#0;class#PGInOutRecRs#0" />
-            <element signature="method#getRecentPosition#0;class#PGInOutRecRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="e#3371#3383#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1092,9 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1102,9 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1109">
           <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1112,19 +698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#597#598#0" expanded="true" />
-            <element signature="e#626#627#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -1156,21 +729,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="107" column="32" lean-forward="true" selection-start-line="107" selection-start-column="32" selection-end-line="107" selection-end-column="32" />
-          <folding>
-            <element signature="method#getAllMac#0;class#TagmacRun#0" />
-            <element signature="method#getViaHostId#0;class#TagmacRun#0" />
-            <element signature="method#GetTagStatus#0;class#TagmacRun#0" />
-            <element signature="method#getMinInTime#0;class#TagmacRun#0" />
-            <element signature="method#postInOut#0;class#TagmacRun#0" />
-            <element signature="method#main#0;class#TagmacRun#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="163">
@@ -1178,13 +736,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1220,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="348">
@@ -1238,9 +782,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1255,13 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="7" column="52" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#965#966#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1052#1053#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1269,13 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
           <caret line="7" column="94" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="94" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1383#1384#0" expanded="true" />
-            <element signature="e#1408#1409#0" expanded="true" />
-            <element signature="e#1442#1443#0" expanded="true" />
-            <element signature="e#1470#1471#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1286,18 +813,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="68" lean-forward="true" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-          <folding>
-            <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-            <element signature="e#2267#2269#0" />
-            <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-            <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="131" column="51" lean-forward="true" selection-start-line="131" selection-start-column="51" selection-end-line="131" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="233" column="55" lean-forward="true" selection-start-line="233" selection-start-column="55" selection-end-line="233" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="136" column="28" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
index ad9d569..d3bc27f 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
@@ -20,7 +20,9 @@
     private Long id;
     private String alarmValue;//报警值
     private Date alarmDate;//报警时间
+    private Date logTime;//消警时间
     private String description;//描述
+    private String logDesc;//消警描述
     private PgAlarmType alarmTypeId;//报警类型
     private PgDevice alarmDevId;//报警设备
     private PgUser userId;//责任人
@@ -55,6 +57,24 @@
         this.alarmDate = alarmDate;
     }
 
+    @Column(name="LOG_TIME")
+    public Date getLogTime() {
+        return logTime;
+    }
+
+    public void setLogTime(Date logTime) {
+        this.logTime = logTime;
+    }
+
+    @Column(name="LOG_DESC")
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
     @Column(name = "DESCRIPTION")
     public String getDescription() {
         return description;
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 6a8e293..92a6b47 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -73,7 +73,7 @@
     public int getAlarmNum(String isDevFault) {
         String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm ";
 
-        if(isDevFault!=null) {
+        if(StringUtils.isNotBlank(isDevFault)) {
             if (isDevFault.equals("true"))
                 hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
             else
@@ -140,15 +140,14 @@
 
         String hql="from PgAlarm a where a.active = 1";
 
-        if(isDevFault!=null)
+        if(StringUtils.isNotBlank(isDevFault))
             if(isDevFault.equals("true"))
                 hql+=" and a.alarmTypeId = " + pgAlarmType.getId();
             else if(isDevFault.equals("false"))
                 hql+=" and a.alarmTypeId != " + pgAlarmType.getId();
         Query query=this.getSession().createQuery(hql);
-        List<PgAlarm>pgAlarmList=query.list();
 
-        //List<PgAlarm> pgAlarmList = (List<PgAlarm>)criteria.list();
+        List<PgAlarm>pgAlarmList=query.list();
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         for(PgAlarm pgAlarm : pgAlarmList)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 7866ed2..ceceff3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -17,10 +17,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -80,6 +77,8 @@
                 result = "false";
             } else {
                 pgAlarm.setActive(0);
+                pgAlarm.setLogTime(new Date());
+                pgAlarm.setLogDesc("人工消警");
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bde2282..523e99c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,395 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b1b64b7-240e-4bb5-a60f-e8f40a5f1f86" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/ojdbc6_11_1_0_7_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRemoveMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConWorkOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRemoveMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRequestMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConWorkOrderManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bin/ojdbc6-11.1.0.7.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/smartfox_info.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PgInterface.iml" beforeDir="false" afterPath="$PROJECT_DIR$/PgInterface.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstruction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstructionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgCsDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgCsDocumentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgCsDocumentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/auth/AuthFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/Cache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/CacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/LocalCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/MapCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/RemoteCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/CsvExportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/Exportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/TableModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailConsumer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailFacade.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailStore.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MemoryMailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/rest/RestFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/FileStoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/MultipartFileResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityCreatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityRemovedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityUpdatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao$SynchronizationNotification.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateEntityDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernatePagingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/MatchType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionDefinition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/RecoverableSessionFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SessionFactoryWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionSynchronization.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/StatisticsWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionPool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/MockHttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/httpURL.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/i18n/AcceptLanguageHeaderFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceChecker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceProxy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceServiceFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/MockDataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/JulHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/ResourceExistsPropertyDefiner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGeneratorImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/BeanMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/page/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$VirtualFilterChain.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/GetFileServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/PathHttpServletRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilterConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServletConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ServletFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$AllPassUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$EqualsUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$PrefixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$SuffixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationPropertiesFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/DateConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/MessageHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BaseDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ConvertUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/EncodeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/HttpClientUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/IoUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonTool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/PropertiesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RandomCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/configProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCh4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgO2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgSh.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgTempHum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCh4Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryTempDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgO2Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgShDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgTempHumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCh4Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCoManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgO2Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgShManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgTempHumManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarm.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarmType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDevice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDeviceType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgEquipment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPartition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPipeLine.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgRoad.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PipeGallery.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgEquipmentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPartitionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgRoadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgEquipmentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPartitionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPipeLineManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgRoadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PipeGalleryManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/apiTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGInOutRecDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGTagMacDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGInOutRecManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGTagMacManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAlarmRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAuthority.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgPerson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgMaintainType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAuthorityDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgLogDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgRoleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAuthorityManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgLogManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgRoleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgUserManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/domain/PgReservePlan.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmLinkRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRuleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTjRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAuthorityRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCh4Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCoRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCsDocumentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgEquipmentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgPersonRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgStatusRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgLogRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintainTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgO2Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgOverViewRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPartitionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPipeLineRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgReservePlanRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoadRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgShRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgTempHumRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgUserRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PipeGalleryRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/pgStatisticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/test/apiTestTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/console.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/file.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/inspektr.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/log4jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/properties.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-bridge.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-cache.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-filter.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-hibernate.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-service.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-springmvc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/taskConfig-applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -423,59 +40,64 @@
     <session id="-697639591">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.16" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="68" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="8" />
+          <entry key="java" value="78" />
+          <entry key="properties" value="4" />
+          <entry key="xml" value="9" />
           <entry key="xsd" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="68" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="11" />
+          <entry key="JAVA" value="78" />
+          <entry key="Properties" value="4" />
+          <entry key="XML" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2977" />
+          <entry key="java" value="3251" />
+          <entry key="txt" value="20" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2977" />
+          <entry key="JAVA" value="3251" />
+          <entry key="PLAIN_TEXT" value="20" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-              <folding>
-                <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-                <element signature="e#2267#2269#0" />
-                <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-                <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-              </folding>
+            <state relative-caret-position="307">
+              <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -503,6 +125,7 @@
       <find>compositeFilter</find>
       <find>PG_CON_REMOVE_MSG</find>
       <find>oracle</find>
+      <find>pgdevice0_</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -520,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" />
@@ -528,6 +150,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
       </list>
     </option>
   </component>
@@ -571,10 +198,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="578" />
-    <option name="y" value="18" />
-    <option name="width" value="741" />
-    <option name="height" value="659" />
+    <option name="x" value="10" />
+    <option name="y" value="20" />
+    <option name="width" value="1346" />
+    <option name="height" value="688" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -582,8 +209,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -633,7 +261,25 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="devData" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -643,27 +289,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -684,13 +310,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583481424174" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583491628370" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../pgdsc" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -878,18 +503,28 @@
       <updated>1583376035104</updated>
       <workItem from="1583376038228" duration="4767000" />
       <workItem from="1583390525399" duration="11491000" />
-      <workItem from="1583455718406" duration="17586000" />
+      <workItem from="1583455718406" duration="26205000" />
+      <workItem from="1583648679095" duration="1231000" />
+      <workItem from="1583719625806" duration="1022000" />
     </task>
+    <task id="LOCAL-00001" summary="添加分区定位接口">
+      <created>1583481566842</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1583481566842</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33844000" />
+    <option name="totallyTimeSpent" value="44716000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21558245" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -900,7 +535,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5829228" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.50246304" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -965,14 +600,15 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="添加分区定位接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加分区定位接口" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2332">
           <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,9 +623,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="449">
           <caret line="236" column="5" lean-forward="true" selection-start-line="236" selection-start-column="5" selection-end-line="236" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,23 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="185">
           <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="205" column="60" lean-forward="true" selection-start-line="205" selection-start-column="60" selection-end-line="205" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="50" column="56" lean-forward="true" selection-start-line="50" selection-start-column="56" selection-end-line="50" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -1021,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="25" column="61" selection-start-line="25" selection-start-column="48" selection-end-line="25" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1031,19 +644,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="18" column="75" selection-start-line="18" selection-start-column="63" selection-end-line="18" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <folding>
-            <element signature="e#0#3513#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-726" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.java">
@@ -1067,24 +673,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="137" column="39" lean-forward="true" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
-          <folding>
-            <element signature="method#query#0;class#PGInOutRecRs#0" />
-            <element signature="method#getRecentPosition#0;class#PGInOutRecRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="e#3371#3383#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1092,9 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1102,9 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1109">
           <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1112,19 +698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#597#598#0" expanded="true" />
-            <element signature="e#626#627#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -1156,21 +729,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="107" column="32" lean-forward="true" selection-start-line="107" selection-start-column="32" selection-end-line="107" selection-end-column="32" />
-          <folding>
-            <element signature="method#getAllMac#0;class#TagmacRun#0" />
-            <element signature="method#getViaHostId#0;class#TagmacRun#0" />
-            <element signature="method#GetTagStatus#0;class#TagmacRun#0" />
-            <element signature="method#getMinInTime#0;class#TagmacRun#0" />
-            <element signature="method#postInOut#0;class#TagmacRun#0" />
-            <element signature="method#main#0;class#TagmacRun#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="163">
@@ -1178,13 +736,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1220,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="348">
@@ -1238,9 +782,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1255,13 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="7" column="52" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#965#966#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1052#1053#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1269,13 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
           <caret line="7" column="94" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="94" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1383#1384#0" expanded="true" />
-            <element signature="e#1408#1409#0" expanded="true" />
-            <element signature="e#1442#1443#0" expanded="true" />
-            <element signature="e#1470#1471#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1286,18 +813,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="68" lean-forward="true" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-          <folding>
-            <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-            <element signature="e#2267#2269#0" />
-            <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-            <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="131" column="51" lean-forward="true" selection-start-line="131" selection-start-column="51" selection-end-line="131" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="233" column="55" lean-forward="true" selection-start-line="233" selection-start-column="55" selection-end-line="233" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="136" column="28" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
index ad9d569..d3bc27f 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
@@ -20,7 +20,9 @@
     private Long id;
     private String alarmValue;//报警值
     private Date alarmDate;//报警时间
+    private Date logTime;//消警时间
     private String description;//描述
+    private String logDesc;//消警描述
     private PgAlarmType alarmTypeId;//报警类型
     private PgDevice alarmDevId;//报警设备
     private PgUser userId;//责任人
@@ -55,6 +57,24 @@
         this.alarmDate = alarmDate;
     }
 
+    @Column(name="LOG_TIME")
+    public Date getLogTime() {
+        return logTime;
+    }
+
+    public void setLogTime(Date logTime) {
+        this.logTime = logTime;
+    }
+
+    @Column(name="LOG_DESC")
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
     @Column(name = "DESCRIPTION")
     public String getDescription() {
         return description;
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 6a8e293..92a6b47 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -73,7 +73,7 @@
     public int getAlarmNum(String isDevFault) {
         String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm ";
 
-        if(isDevFault!=null) {
+        if(StringUtils.isNotBlank(isDevFault)) {
             if (isDevFault.equals("true"))
                 hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
             else
@@ -140,15 +140,14 @@
 
         String hql="from PgAlarm a where a.active = 1";
 
-        if(isDevFault!=null)
+        if(StringUtils.isNotBlank(isDevFault))
             if(isDevFault.equals("true"))
                 hql+=" and a.alarmTypeId = " + pgAlarmType.getId();
             else if(isDevFault.equals("false"))
                 hql+=" and a.alarmTypeId != " + pgAlarmType.getId();
         Query query=this.getSession().createQuery(hql);
-        List<PgAlarm>pgAlarmList=query.list();
 
-        //List<PgAlarm> pgAlarmList = (List<PgAlarm>)criteria.list();
+        List<PgAlarm>pgAlarmList=query.list();
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         for(PgAlarm pgAlarm : pgAlarmList)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 7866ed2..ceceff3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -17,10 +17,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -80,6 +77,8 @@
                 result = "false";
             } else {
                 pgAlarm.setActive(0);
+                pgAlarm.setLogTime(new Date());
+                pgAlarm.setLogDesc("人工消警");
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 70b3b41..db30814 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -278,7 +278,7 @@
         String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
-            pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            //pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
             code="200";
             msg="信息获取成功";
         }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bde2282..523e99c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,395 +8,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b1b64b7-240e-4bb5-a60f-e8f40a5f1f86" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/ojdbc6_11_1_0_7_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRemoveMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConWorkOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRemoveMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConRequestMsgManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConWorkOrderManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bin/ojdbc6-11.1.0.7.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20170516.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/smartfox_info.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PgInterface.iml" beforeDir="false" afterPath="$PROJECT_DIR$/PgInterface.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstruction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgConstructionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/domain/PgCsDocument.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/dto/PgCsDocumentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/construction/manager/PgCsDocumentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/auth/AuthFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/Cache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/CacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/LocalCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/MapCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/cache/RemoteCacheStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/CsvExportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/Exportor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/export/TableModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailConsumer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailFacade.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailStore.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MailWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/mail/MemoryMailServerInfoCache.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/rest/RestFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/FileStoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/MultipartFileResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreConnector.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/ext/store/StoreDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityCreatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityRemovedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/EntityUpdatedEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao$SynchronizationNotification.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateBasicDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateEntityDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernatePagingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/HibernateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/MatchType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyFilterUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/PropertyType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionDefinition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/ReadOnlyTransactionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/RecoverableSessionFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SessionFactoryWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/SpringSessionSynchronization.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/hibernate/StatisticsWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionPool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpConnectionResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/HttpHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/MockHttpHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/http/httpURL.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/i18n/AcceptLanguageHeaderFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceChecker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceProxy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceServiceFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DataSourceWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/DbcpDataSourceInfoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/jdbc/MockDataSource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/JulHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/logback/ResourceExistsPropertyDefiner.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mail/HostGeneratorImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/BeanMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/mapper/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/page/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter$VirtualFilterChain.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/CompositeFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/GetFileServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/PathHttpServletRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyFilterConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ProxyServletConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/ServletFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$AllPassUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$EqualsUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$PrefixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher$SuffixUrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/servlet/UrlPatternMatcher.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/ApplicationPropertiesFactoryBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/DateConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/spring/MessageHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BaseDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/BeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ConvertUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/EncodeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/HttpClientUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/IoUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/JsonTool.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/PropertiesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RandomCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/RestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/ServletUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/core/util/configProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCh4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgCo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgO2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgSh.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/domain/PgTempHum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCh4Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgCoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgHistoryTempDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgO2Dto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgShDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/dto/PgTempHumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCh4Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgCoManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgO2Manager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgShManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devData/manager/PgTempHumManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarm.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgAlarmType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDevice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgDeviceType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgEquipment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPartition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgPipeLine.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PgRoad.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/domain/PipeGallery.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgEquipmentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPartitionDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineLengthStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PgRoadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgDeviceTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgEquipmentManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPartitionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgPipeLineManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PgRoadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/devTable/manager/PipeGalleryManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/maintenance/manager/apiTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGInOutRecDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/dto/PGTagMacDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGInOutRecManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/manager/PGTagMacManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/overtimeInPG/task/TagmacRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAlarmRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgAuthority.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgPerson.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgInPgStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgMaintainType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/domain/PgUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgAuthorityDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgLogDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgRoleDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/dto/PgUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgAuthorityManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgLogManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgRoleManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/patroler/manager/PgUserManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/domain/PgReservePlan.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmLinkRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmRuleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTjRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAlarmTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgAuthorityRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCh4Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCoRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgConstructionTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgCsDocumentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgDeviceTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgEquipmentRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgPersonRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgInPgStatusRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgLogRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintainTypeRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgMaintanceRecordStaticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgO2Rs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgOverViewRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPartitionRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgPipeLineRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgReservePlanRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoadRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgRoleRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgShRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgTempHumRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PgUserRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/PipeGalleryRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/rs/pgStatisticRs.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/casic/PgInterface/test/apiTestTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/console.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/file.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/inspektr.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/log4jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/logback/mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/properties.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-bridge.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-cache.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-filter.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-hibernate.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-jdbc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-mail.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-service.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext-springmvc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/spring/taskConfig-applicationContext.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20191207.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明20191207.docx" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -423,59 +40,64 @@
     <session id="-697639591">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.16" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.22" value="1" />
           <entry key="project.open.time.3" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="68" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="8" />
+          <entry key="java" value="78" />
+          <entry key="properties" value="4" />
+          <entry key="xml" value="9" />
           <entry key="xsd" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="68" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="11" />
+          <entry key="JAVA" value="78" />
+          <entry key="Properties" value="4" />
+          <entry key="XML" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2977" />
+          <entry key="java" value="3251" />
+          <entry key="txt" value="20" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2977" />
+          <entry key="JAVA" value="3251" />
+          <entry key="PLAIN_TEXT" value="20" />
           <entry key="XML" value="2" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-              <folding>
-                <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-                <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-                <element signature="e#2267#2269#0" />
-                <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-                <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-              </folding>
+            <state relative-caret-position="307">
+              <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -503,6 +125,7 @@
       <find>compositeFilter</find>
       <find>PG_CON_REMOVE_MSG</find>
       <find>oracle</find>
+      <find>pgdevice0_</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -520,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConWorkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetPlanManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java" />
@@ -528,6 +150,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRemoveMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConRequestMsg.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConWorkOrder.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
       </list>
     </option>
   </component>
@@ -571,10 +198,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="578" />
-    <option name="y" value="18" />
-    <option name="width" value="741" />
-    <option name="height" value="659" />
+    <option name="x" value="10" />
+    <option name="y" value="20" />
+    <option name="width" value="1346" />
+    <option name="height" value="688" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -582,8 +209,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -633,7 +261,25 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
+              <item name="devData" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="devTable" type="462c0819:PsiDirectoryNode" />
               <item name="domain" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -643,27 +289,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenance" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -684,13 +310,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583481424174" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1583491628370" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../pgdsc" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -878,18 +503,28 @@
       <updated>1583376035104</updated>
       <workItem from="1583376038228" duration="4767000" />
       <workItem from="1583390525399" duration="11491000" />
-      <workItem from="1583455718406" duration="17586000" />
+      <workItem from="1583455718406" duration="26205000" />
+      <workItem from="1583648679095" duration="1231000" />
+      <workItem from="1583719625806" duration="1022000" />
     </task>
+    <task id="LOCAL-00001" summary="添加分区定位接口">
+      <created>1583481566842</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1583481566842</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33844000" />
+    <option name="totallyTimeSpent" value="44716000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21558245" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -900,7 +535,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5829228" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.50246304" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -965,14 +600,15 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="添加分区定位接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加分区定位接口" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConRequestMsgDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2332">
           <caret line="166" column="5" lean-forward="true" selection-start-line="166" selection-start-column="5" selection-end-line="166" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -987,9 +623,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="449">
           <caret line="236" column="5" lean-forward="true" selection-start-line="236" selection-start-column="5" selection-end-line="236" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,23 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="185">
           <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="205" column="60" lean-forward="true" selection-start-line="205" selection-start-column="60" selection-end-line="205" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="50" column="56" lean-forward="true" selection-start-line="50" selection-start-column="56" selection-end-line="50" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -1021,9 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="25" column="61" selection-start-line="25" selection-start-column="48" selection-end-line="25" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1031,19 +644,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="18" column="75" selection-start-line="18" selection-start-column="63" selection-end-line="18" selection-end-column="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <folding>
-            <element signature="e#0#3513#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-726" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGInOutRec.java">
@@ -1067,24 +673,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="137" column="39" lean-forward="true" selection-start-line="137" selection-start-column="39" selection-end-line="137" selection-end-column="39" />
-          <folding>
-            <element signature="method#query#0;class#PGInOutRecRs#0" />
-            <element signature="method#getRecentPosition#0;class#PGInOutRecRs#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="e#3371#3383#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1092,9 +684,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
           <caret line="19" selection-start-line="19" selection-end-line="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1102,9 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1109">
           <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1112,19 +698,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="29" column="28" lean-forward="true" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#597#598#0" expanded="true" />
-            <element signature="e#626#627#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -1156,21 +729,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="107" column="32" lean-forward="true" selection-start-line="107" selection-start-column="32" selection-end-line="107" selection-end-column="32" />
-          <folding>
-            <element signature="method#getAllMac#0;class#TagmacRun#0" />
-            <element signature="method#getViaHostId#0;class#TagmacRun#0" />
-            <element signature="method#GetTagStatus#0;class#TagmacRun#0" />
-            <element signature="method#getMinInTime#0;class#TagmacRun#0" />
-            <element signature="method#postInOut#0;class#TagmacRun#0" />
-            <element signature="method#main#0;class#TagmacRun#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="163">
@@ -1178,13 +736,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1220,13 +771,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="127" column="9" selection-start-line="127" selection-start-column="9" selection-end-line="127" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="348">
@@ -1238,9 +782,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1255,13 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
           <caret line="7" column="52" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#965#966#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1052#1053#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1269,13 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="154">
           <caret line="7" column="94" selection-start-line="7" selection-start-column="70" selection-end-line="7" selection-end-column="94" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1383#1384#0" expanded="true" />
-            <element signature="e#1408#1409#0" expanded="true" />
-            <element signature="e#1442#1443#0" expanded="true" />
-            <element signature="e#1470#1471#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1286,18 +813,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="68" lean-forward="true" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="137" column="22" lean-forward="true" selection-start-line="137" selection-start-column="22" selection-end-line="137" selection-end-column="22" />
-          <folding>
-            <element signature="method#findTagPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getAllPosition#0;class#PGTagPositionManager#0" />
-            <element signature="method#getMaxId#0;class#PGTagPositionManager#0" />
-            <element signature="e#2267#2269#0" />
-            <element signature="method#getHisByHostId#0;class#PGTagPositionManager#0" />
-            <element signature="method#getHisByHostIdView#0;class#PGTagPositionManager#0" />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="131" column="51" lean-forward="true" selection-start-line="131" selection-start-column="51" selection-end-line="131" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="233" column="55" lean-forward="true" selection-start-line="233" selection-start-column="55" selection-end-line="233" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="71">
+          <caret line="136" column="28" selection-start-line="136" selection-start-column="28" selection-end-line="136" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="68" column="28" lean-forward="true" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="86" column="31" lean-forward="true" selection-start-line="86" selection-start-column="31" selection-end-line="86" selection-end-column="31" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
index ad9d569..d3bc27f 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java
@@ -20,7 +20,9 @@
     private Long id;
     private String alarmValue;//报警值
     private Date alarmDate;//报警时间
+    private Date logTime;//消警时间
     private String description;//描述
+    private String logDesc;//消警描述
     private PgAlarmType alarmTypeId;//报警类型
     private PgDevice alarmDevId;//报警设备
     private PgUser userId;//责任人
@@ -55,6 +57,24 @@
         this.alarmDate = alarmDate;
     }
 
+    @Column(name="LOG_TIME")
+    public Date getLogTime() {
+        return logTime;
+    }
+
+    public void setLogTime(Date logTime) {
+        this.logTime = logTime;
+    }
+
+    @Column(name="LOG_DESC")
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
     @Column(name = "DESCRIPTION")
     public String getDescription() {
         return description;
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index 6a8e293..92a6b47 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -73,7 +73,7 @@
     public int getAlarmNum(String isDevFault) {
         String hql = "select count(distinct alarmDevId) from PgAlarm pgAlarm ";
 
-        if(isDevFault!=null) {
+        if(StringUtils.isNotBlank(isDevFault)) {
             if (isDevFault.equals("true"))
                 hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
             else
@@ -140,15 +140,14 @@
 
         String hql="from PgAlarm a where a.active = 1";
 
-        if(isDevFault!=null)
+        if(StringUtils.isNotBlank(isDevFault))
             if(isDevFault.equals("true"))
                 hql+=" and a.alarmTypeId = " + pgAlarmType.getId();
             else if(isDevFault.equals("false"))
                 hql+=" and a.alarmTypeId != " + pgAlarmType.getId();
         Query query=this.getSession().createQuery(hql);
-        List<PgAlarm>pgAlarmList=query.list();
 
-        //List<PgAlarm> pgAlarmList = (List<PgAlarm>)criteria.list();
+        List<PgAlarm>pgAlarmList=query.list();
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         for(PgAlarm pgAlarm : pgAlarmList)
         {
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 7866ed2..ceceff3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -17,10 +17,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2017/11/4.
@@ -80,6 +77,8 @@
                 result = "false";
             } else {
                 pgAlarm.setActive(0);
+                pgAlarm.setLogTime(new Date());
+                pgAlarm.setLogDesc("人工消警");
                 pgAlarmManager.save(pgAlarm);
                 msg = "报警信息清除成功";
                 result = "true";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 70b3b41..db30814 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -278,7 +278,7 @@
         String code="0";
         List<PgAlarmDto> pgAlarmDtoList=new ArrayList<>();
         try{
-            pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            //pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
             code="200";
             msg="信息获取成功";
         }
diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml
index 69776c5..76b19b4 100644
--- a/src/main/resources/spring/taskConfig-applicationContext.xml
+++ b/src/main/resources/spring/taskConfig-applicationContext.xml
@@ -13,7 +13,7 @@
     <bean id="PGTask" class="com.casic.PgInterface.overtimeInPG.task.SyncPGtask"></bean>
 
     <task:scheduled-tasks>
-        <task:scheduled ref="PGTask" method="getAllMac" cron="0 0 14 * * ? "/>
+        <!--<task:scheduled ref="PGTask" method="getAllMac" cron="0 0 14 * * ? "/>-->
         <task:scheduled ref="PGTask" method="getMacPosition" cron="0 0/5 * * * ? "/>
         <!--<task:scheduled ref="PGTask" method="overtimeInPG" cron="0 0/20 * * * ?" />-->
     </task:scheduled-tasks>