diff --git a/.idea/artifacts/platform_sync_data_war.xml b/.idea/artifacts/platform_sync_data_war.xml new file mode 100644 index 0000000..9fff4bc --- /dev/null +++ b/.idea/artifacts/platform_sync_data_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/platform-sync-data/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/platform_sync_data_war_exploded.xml b/.idea/artifacts/platform_sync_data_war_exploded.xml new file mode 100644 index 0000000..54f20f2 --- /dev/null +++ b/.idea/artifacts/platform_sync_data_war_exploded.xml @@ -0,0 +1,120 @@ + + + $PROJECT_DIR$/platform-sync-data/target/platform-sync-data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml new file mode 100644 index 0000000..c6ea67e --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml new file mode 100644 index 0000000..f538e36 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_0_31.xml b/.idea/libraries/Maven__com_alibaba_druid_1_0_31.xml new file mode 100644 index 0000000..82b83f6 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_1_0_31.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml new file mode 100644 index 0000000..9b223e0 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml new file mode 100644 index 0000000..578b079 --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 0000000..b8581a6 --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_41.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_41.xml new file mode 100644 index 0000000..e2831f2 --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_41.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml new file mode 100644 index 0000000..88d626e --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml new file mode 100644 index 0000000..6c692c8 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml new file mode 100644 index 0000000..1e0b53d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml new file mode 100644 index 0000000..78cfcd3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml new file mode 100644 index 0000000..666266c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_14.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_14.xml new file mode 100644 index 0000000..f91cc73 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_14.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_14.xml new file mode 100644 index 0000000..25435e2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml new file mode 100644 index 0000000..36093ff --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml new file mode 100644 index 0000000..58bdc9a --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_3_8_v20160314.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_3_8_v20160314.xml new file mode 100644 index 0000000..aebf72f --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_3_8_v20160314.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_8_v20160314.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_8_v20160314.xml new file mode 100644 index 0000000..302a1ad --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_8_v20160314.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_8_v20160314.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_8_v20160314.xml new file mode 100644 index 0000000..933fb26 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_8_v20160314.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_3_8_v20160314.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_3_8_v20160314.xml new file mode 100644 index 0000000..b215bbb --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_3_8_v20160314.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_8_v20160314.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_8_v20160314.xml new file mode 100644 index 0000000..729e79c --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_8_v20160314.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 0000000..78dbe45 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml new file mode 100644 index 0000000..a523703 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_bson_3_4_2.xml b/.idea/libraries/Maven__org_mongodb_bson_3_4_2.xml new file mode 100644 index 0000000..3ad18d7 --- /dev/null +++ b/.idea/libraries/Maven__org_mongodb_bson_3_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_4_2.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_4_2.xml new file mode 100644 index 0000000..eb69c1d --- /dev/null +++ b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_4_2.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_4_2.xml new file mode 100644 index 0000000..c315f1a --- /dev/null +++ b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_2.xml new file mode 100644 index 0000000..b65acd9 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml new file mode 100644 index 0000000..774f47c --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_0.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_0.xml new file mode 100644 index 0000000..e2a7a44 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_0.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_0.xml new file mode 100644 index 0000000..c4a46a2 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml new file mode 100644 index 0000000..7ab319b --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml new file mode 100644 index 0000000..da69f6c --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml new file mode 100644 index 0000000..f86d2c8 --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml new file mode 100644 index 0000000..bae9949 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml new file mode 100644 index 0000000..6073e53 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml new file mode 100644 index 0000000..a14ac63 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml new file mode 100644 index 0000000..20e8163 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_3_RELEASE.xml new file mode 100644 index 0000000..f739d39 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_3_RELEASE.xml new file mode 100644 index 0000000..5eb4732 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_5_3_RELEASE.xml new file mode 100644 index 0000000..2de3ad6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_3_RELEASE.xml new file mode 100644 index 0000000..b3f44c0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_3_RELEASE.xml new file mode 100644 index 0000000..3700898 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_1_5_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_1_5_2_RELEASE.xml new file mode 100644 index 0000000..18df672 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_1_5_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_3_RELEASE.xml new file mode 100644 index 0000000..62a089e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_3_RELEASE.xml new file mode 100644 index 0000000..996c9fd --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_3_RELEASE.xml new file mode 100644 index 0000000..c64fd94 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_3_RELEASE.xml new file mode 100644 index 0000000..f212266 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_3_RELEASE.xml new file mode 100644 index 0000000..28a0a1d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_3_RELEASE.xml new file mode 100644 index 0000000..707aa9c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_1_10_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_1_10_3_RELEASE.xml new file mode 100644 index 0000000..5232c55 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_1_10_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_8_RELEASE.xml new file mode 100644 index 0000000..659aa93 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_8_RELEASE.xml new file mode 100644 index 0000000..39b5701 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_3_8_RELEASE.xml new file mode 100644 index 0000000..36db229 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_3_8_RELEASE.xml new file mode 100644 index 0000000..3ab7fea --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_8_RELEASE.xml new file mode 100644 index 0000000..2fff822 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_8_RELEASE.xml new file mode 100644 index 0000000..4af6ee0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_3_8_RELEASE.xml new file mode 100644 index 0000000..885179d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_8_RELEASE.xml new file mode 100644 index 0000000..cf3af98 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml new file mode 100644 index 0000000..20e2920 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index d3c81db..e78407a 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -605,7 +605,7 @@ public class QhdfyHisService { - public List queryLisCheckList(String cardNo) { + public static List queryLisCheckList(String cardNo) { List result = new ArrayList<>(); if (StringUtils.isNotBlank(cardNo)) { Connection conn = ConnTools.makeLisConnection(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index c3069e7..0bf5e7d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -5,7 +5,6 @@ import com.lyms.hospitalapi.pojo.CheckByDate; import com.lyms.hospitalapi.pojo.CheckItemResponse; import com.lyms.hospitalapi.pojo.CheckResponse; import com.lyms.hospitalapi.pojo.CheckType; -import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -58,12 +57,6 @@ public class LisFacade { @Qualifier("commonThreadPool") private ThreadPoolTaskExecutor commonThreadPool; - @Autowired - private QhdfyHisService qhdfyHisService; - - @Autowired - private NczxyyLisService nczxyyLisService; - public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); /** @@ -79,7 +72,7 @@ public class LisFacade { //获取lis数据 if("7".equals(HIS_VERSION)){ //根据调用接口获取四川南充中心医院的Lis数据 - result.addAll(nczxyyLisService.queryLisCheckList(vcCardNo)); + result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); }else{ result.addAll(queryLisCheckList(vcCardNo,phone,userId)); } @@ -167,7 +160,7 @@ public class LisFacade { List result = new ArrayList(); if("7".equals(HIS_VERSION)){ //根据调用接口获取四川南充中心医院的Lis数据 - result.addAll(nczxyyLisService.queryLisCheckList(vcCardNo)); + result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); }else{ result.addAll(queryLisCheckList(vcCardNo,phone,userId)); } @@ -741,8 +734,6 @@ public class LisFacade { titles.add("尿常规"); titles.add("[丙]血常规(24项)"); titles.add("血常规(24项)"); - titles.add("血细胞分析（静脉）"); - titles.add("血细胞分析（末梢）"); isQuery = true; } //青龙满族自治县医院 @@ -765,15 +756,7 @@ public class LisFacade { query.setTitles(titles); query.setHospitalId(hospitalId); query.setCheckTime(DateUtil.parseYMD(checkTime)); - List lises = null; - if ("216".equals(hospitalId)) - { - lises = qhdfyHisService.queryQhdCheckLisInfo(vcCardNo,phone,"('尿常规','[丙]血常规(24项)','血常规(24项)','血细胞分析（末梢）','血细胞分析（静脉）')", checkTime); - } - else - { - lises = queryCheckLis(vcCardNo,phone,query); - } + List lises = queryCheckLis(vcCardNo,phone,query); if (CollectionUtils.isNotEmpty(lises)) { @@ -788,17 +771,12 @@ public class LisFacade { map1.put("nt",""); //尿糖 map1.put("ntt",""); //尿酮体 map1.put("nqx",""); //尿潜血 -// String itemJson = model.getItemJson(); -// List items = JsonUtil.toList(itemJson,LisReportItemModel.class) - List items = model.getItems();; + String itemJson = model.getItemJson(); + List items = JsonUtil.toList(itemJson,LisReportItemModel.class); if (CollectionUtils.isNotEmpty(items)) { for(LisReportItemModel item : items) { - if (item == null) - { - continue; - } if ("尿蛋白".equals(item.getName())) { map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); @@ -816,39 +794,32 @@ public class LisFacade { map1.put("nqx",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); } } - map.put("ncg",map1); } - + map.put("ncg",map1); } - else if ("[丙]血常规(24项)".equals(model.getTitle()) || "血常规(24项)".equals(model.getTitle()) - || "血细胞分析（末梢）".equals(model.getTitle()) || "血细胞分析（静脉）".equals(model.getTitle())) + else if ("[丙]血常规(24项)".equals(model.getTitle()) || "血常规(24项)".equals(model.getTitle())) { Map map1 = new HashMap<>(); map1.put("xhdb",""); //血红蛋白 map1.put("bxbjs","");//白细胞计数 map1.put("xxbjs",""); //血小板计数 -// String itemJson = model.getItemJson(); -// List items = JsonUtil.toList(itemJson,LisReportItemModel.class); - List items = model.getItems(); + String itemJson = model.getItemJson(); + List items = JsonUtil.toList(itemJson,LisReportItemModel.class); if (CollectionUtils.isNotEmpty(items)) { for(LisReportItemModel item : items) { - if (item == null) - { - continue; - } if ("血红蛋白".equals(item.getName())) { - map1.put("xhdb",StringUtils.isNotEmpty(item.getResult()) ? item.getResult() : item.getNumberResult()); + map1.put("xhdb",item.getNumberResult()); } else if ("白细胞计数".equals(item.getName())) { - map1.put("bxbjs",StringUtils.isNotEmpty(item.getResult()) ? item.getResult() : item.getNumberResult()); + map1.put("bxbjs",item.getNumberResult()); } else if ("血小板计数".equals(item.getName()) || "血小板".equals(item.getName())) { - map1.put("xxbjs",StringUtils.isNotEmpty(item.getResult()) ? item.getResult() : item.getNumberResult()); + map1.put("xxbjs",item.getNumberResult()); } } } @@ -870,10 +841,6 @@ public class LisFacade { { for(LisReportItemModel item : items) { - if (item == null) - { - continue; - } if ("尿蛋白".equals(item.getName())) { map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); @@ -907,10 +874,6 @@ public class LisFacade { { for(LisReportItemModel item : items) { - if (item == null) - { - continue; - } if ("血红蛋白".equals(item.getName())) { map1.put("xhdb",item.getNumberResult()); diff --git a/platform-sync-data/platform-sync-data.iml b/platform-sync-data/platform-sync-data.iml new file mode 100644 index 0000000..cd8383f --- /dev/null +++ b/platform-sync-data/platform-sync-data.iml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/regional-etl/regional-etl.iml b/regional-etl/regional-etl.iml new file mode 100644 index 0000000..b0896a1 --- /dev/null +++ b/regional-etl/regional-etl.iml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file